]> err.no Git - linux-2.6/commitdiff
[PATCH] Char: isicom, check kmalloc retval
authorJiri Slaby <jirislaby@gmail.com>
Fri, 8 Dec 2006 10:38:54 +0000 (02:38 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Fri, 8 Dec 2006 16:28:57 +0000 (08:28 -0800)
Value returned from kamlloc may be NULL, we should check if ENOMEM occured.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/char/isicom.c

index 91b978445229edfc1a527d9e566327f3e8019c22..783a7ec0a8e61ad87cf1fc27b5b4563cd2565221 100644 (file)
@@ -1709,6 +1709,11 @@ static int __devinit load_firmware(struct pci_dev *pdev,
                }
 
                data = kmalloc(word_count * 2, GFP_KERNEL);
+               if (data == NULL) {
+                       dev_err(&pdev->dev, "Card%d, firmware upload "
+                               "failed, not enough memory\n", index + 1);
+                       goto errrelfw;
+               }
                inw(base);
                insw(base, data, word_count);
                InterruptTheCard(base);