staging: slicoss: fix a leak when kzalloc fail
authorDevendra Naga <devendra.aaru@gmail.com>
Thu, 25 Oct 2012 06:11:51 +0000 (02:11 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Oct 2012 16:36:06 +0000 (09:36 -0700)
slic_card_locate does a kzalloc of physcard, and if it fails,
in my previous patch i returned -ENOMEM, but left the driver leak
the memory if card_hostid == SLIC_HOSTID_DEFAULT,

fix this memory leak if the above condition is true

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/slicoss/slicoss.c

index f08f459..ee0f0e4 100644 (file)
@@ -3657,8 +3657,11 @@ static u32 slic_card_locate(struct adapter *adapter)
        if (!physcard) {
                /* no structure allocated for this physical card yet */
                physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC);
-               if (!physcard)
+               if (!physcard) {
+                       if (card_hostid == SLIC_HOSTID_DEFAULT)
+                               kfree(card);
                        return -ENOMEM;
+               }
 
                physcard->next = slic_global.phys_card;
                slic_global.phys_card = physcard;