Commit b171041b authored by Julia Lawall's avatar Julia Lawall Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: introduce missing kfree 

Error handling code following a kmalloc should free the allocated data.

The semantic match that finds the problem is as follows:
(http://www.emn.fr/x-info/coccinelle/

)

// <smpl>
@r exists@
local idexpression x;
statement S;
expression E;
identifier f,l;
position p1,p2;
expression *ptr != NULL;
@@

(
if ((x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...)) == NULL) S
|
x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
)
<... when != x
     when != if (...) { <+...x...+> }
x->f = E
...>
(
 return \(0\|<+...x...+>\|ptr\);
|
 return@p2 ...;
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fc0cb7d1

drivers/staging/comedi/drivers/usbdux.c

+5 −1
Original line number Diff line number Diff line
@@ -2298,7 +2298,7 @@ static int read_firmware(struct usbduxsub *usbduxsub, void *firmwarePtr, 
	struct device *dev = &usbduxsub->interface->dev;

	int i = 0;

	unsigned char *fp = (char *)firmwarePtr;

	unsigned char *firmwareBinary = NULL;

	unsigned char *firmwareBinary;

	int res = 0;

	int maxAddr = 0;
@@ -2322,6 +2322,7 @@ static int read_firmware(struct usbduxsub *usbduxsub, void *firmwarePtr, 
			j++;

			if (j >= sizeof(buf)) {

				dev_err(dev, "comedi_: bogus firmware file!\n");

				kfree(firmwareBinary);

				return -1;

			}

		}
@@ -2344,6 +2345,7 @@ static int read_firmware(struct usbduxsub *usbduxsub, void *firmwarePtr, 
		if (buf[0] != ':') {

			dev_err(dev, "comedi_: upload: not an ihex record: %s",

				buf);

			kfree(firmwareBinary);

			return -EFAULT;

		}
@@ -2360,6 +2362,7 @@ static int read_firmware(struct usbduxsub *usbduxsub, void *firmwarePtr, 
		if (maxAddr >= FIRMWARE_MAX_LEN) {

			dev_err(dev, "comedi_: firmware upload goes "

				"beyond FX2 RAM boundaries.\n");

			kfree(firmwareBinary);

			return -EFAULT;

		}

		/* dev_dbg(dev, "comedi_: off=%x, len=%x:\n", off, len); */
@@ -2375,6 +2378,7 @@ static int read_firmware(struct usbduxsub *usbduxsub, void *firmwarePtr, 
		if (type != 0) {

			dev_err(dev, "comedi_: unsupported record type: %u\n",

				type);

			kfree(firmwareBinary);

			return -EFAULT;

		}

drivers/staging/comedi/drivers/usbduxfast.c

+5 −1
Original line number Diff line number Diff line
@@ -1298,7 +1298,7 @@ static int read_firmware(usbduxfastsub_t * usbduxfastsub, void *firmwarePtr, 
{

	int i = 0;

	unsigned char *fp = (char *)firmwarePtr;

	unsigned char *firmwareBinary = NULL;

	unsigned char *firmwareBinary;

	int res = 0;

	int maxAddr = 0;
@@ -1322,6 +1322,7 @@ static int read_firmware(usbduxfastsub_t * usbduxfastsub, void *firmwarePtr, 
			j++;

			if (j >= sizeof(buf)) {

				printk("comedi_: usbduxfast: bogus firmware file!\n");

				kfree(firmwareBinary);

				return -1;

			}

		}
@@ -1340,6 +1341,7 @@ static int read_firmware(usbduxfastsub_t * usbduxfastsub, void *firmwarePtr, 


		if (buf[0] != ':') {

			printk("comedi_: usbduxfast: upload: not an ihex record: %s", buf);

			kfree(firmwareBinary);

			return -EFAULT;

		}
@@ -1355,6 +1357,7 @@ static int read_firmware(usbduxfastsub_t * usbduxfastsub, void *firmwarePtr, 


		if (maxAddr >= FIRMWARE_MAX_LEN) {

			printk("comedi_: usbduxfast: firmware upload goes beyond FX2 RAM boundaries.");

			kfree(firmwareBinary);

			return -EFAULT;

		}

		//printk("comedi_: usbduxfast: off=%x, len=%x:",off,len);
@@ -1369,6 +1372,7 @@ static int read_firmware(usbduxfastsub_t * usbduxfastsub, void *firmwarePtr, 


		if (type != 0) {

			printk("comedi_: usbduxfast: unsupported record type: %u\n", type);

			kfree(firmwareBinary);

			return -EFAULT;

		}