]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
cciss: freeing uninitialized data on error path
authorDan Carpenter <error27@gmail.com>
Mon, 13 Sep 2010 12:09:33 +0000 (14:09 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 21 Sep 2010 09:49:17 +0000 (11:49 +0200)
The "h->scatter_list" is allocated inside a for loop.  If any of those
allocations fail, then the rest of the list is uninitialized data.  When
we free it we should start from the top and free backwards so that we
don't call kfree() on uninitialized pointers.

Also if the allocation for "h->scatter_list" fails then we would get an
Oops here.  I should have noticed this when I send: 4ee69851c "cciss:
handle allocation failure."  but I didn't.  Sorry about that.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
drivers/block/cciss.c

index 6124c2fd2d33440f022aa45b369bd7fb7a850c8a..5e4fadcdece979b76571462210f60195a6531f27 100644 (file)
@@ -4792,7 +4792,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
 clean4:
        kfree(h->cmd_pool_bits);
        /* Free up sg elements */
-       for (k = 0; k < h->nr_cmds; k++)
+       for (k-- ; k >= 0; k--)
                kfree(h->scatter_list[k]);
        kfree(h->scatter_list);
        cciss_free_sg_chain_blocks(h->cmd_sg_list, h->nr_cmds);