]> rtime.felk.cvut.cz Git - mcf548x/linux.git/commitdiff
[SCSI] drivers/message/fusion: Return -ENOMEM on memory allocation failure
authorJulia Lawall <julia@diku.dk>
Wed, 11 Aug 2010 10:11:24 +0000 (12:11 +0200)
committerJames Bottomley <James.Bottomley@suse.de>
Sun, 5 Sep 2010 17:55:57 +0000 (14:55 -0300)
In this code, 0 is returned on memory allocation failure, even though other
failures return -ENOMEM or other similar values.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression ret;
expression x,e1,e2,e3;
@@

ret = 0
... when != ret = e1
*x = \(kmalloc\|kcalloc\|kzalloc\)(...)
... when != ret = e2
if (x == NULL) { ... when != ret = e3
  return ret;
}
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: "Desai, Kashyap" <Kashyap.Desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
drivers/message/fusion/mptbase.c

index 6837a8ef93717be71cf4e09ffef6a2e0c3e7bae1..3e57b61ca4469bc615126cfd827d8a19037b604e 100644 (file)
@@ -5945,8 +5945,10 @@ mpt_findImVolumes(MPT_ADAPTER *ioc)
                goto out;
 
        mem = kmalloc(iocpage2sz, GFP_KERNEL);
-       if (!mem)
+       if (!mem) {
+               rc = -ENOMEM;
                goto out;
+       }
 
        memcpy(mem, (u8 *)pIoc2, iocpage2sz);
        ioc->raid_data.pIocPg2 = (IOCPage2_t *) mem;