lkml.org 
[lkml]   [2003]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] Memory leak in block/cciss.c driver
	Hi Linus,

Patch against 2.6-test5 which removes a few memory leaks from the cciss
block driver.

Bug found by smatch checker.

Please apply,

Cheers.

Felipe
--
It's most certainly GNU/Linux, not Linux. Read more at
http://www.gnu.org/gnu/why-gnu-linux.html
--- linux-2.6.0-test5/drivers/block/cciss.c Mon Sep 8 16:50:32 2003
+++ linux-2.6.0-test5-fwd/drivers/block/cciss.c Sun Sep 21 00:46:33 2003
@@ -754,16 +754,24 @@
status = -ENOMEM;
goto cleanup1;
}
- if (copy_from_user(ioc, (void *) arg, sizeof(*ioc)))
- return -EFAULT;
+ if (copy_from_user(ioc, (void *) arg, sizeof(*ioc))) {
+ status = -EFAULT;
+ goto cleanup1;
+ }
if ((ioc->buf_size < 1) &&
- (ioc->Request.Type.Direction != XFER_NONE))
- return -EINVAL;
+ (ioc->Request.Type.Direction != XFER_NONE)) {
+ status = -EINVAL;
+ goto cleanup1;
+ }
/* Check kmalloc limits using all SGs */
- if (ioc->malloc_size > MAX_KMALLOC_SIZE)
- return -EINVAL;
- if (ioc->buf_size > ioc->malloc_size * MAXSGENTRIES)
- return -EINVAL;
+ if (ioc->malloc_size > MAX_KMALLOC_SIZE) {
+ status = -EINVAL;
+ goto cleanup1;
+ }
+ if (ioc->buf_size > ioc->malloc_size * MAXSGENTRIES) {
+ status = -EINVAL;
+ goto cleanup1;
+ }
buff = (unsigned char **) kmalloc(MAXSGENTRIES *
sizeof(char *), GFP_KERNEL);
if (!buff) {
\
 
 \ /
  Last update: 2005-03-22 13:48    [W:0.030 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site