From a2279ae5b58edb7cbe2196d08572fcf59f292354 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Mon, 31 Aug 2009 10:54:37 +0200 Subject: [PATCH] Staging: comedi: addi-data: NULL dereference of amcc in v_pci_card_list_init() amcc allocation may fail, prevent a NULL dereference. allocation may fail, prevent a dereference. Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h | 3 +++ drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h b/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h index d288289143ea..f96b1289cdfc 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h @@ -261,6 +261,9 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) pci_vendor = i_ADDIDATADeviceID[i_Count]; if (pcidev->vendor == pci_vendor) { amcc = kmalloc(sizeof(*amcc), GFP_KERNEL); + if (amcc == NULL) + continue; + memset(amcc, 0, sizeof(*amcc)); amcc->pcidev = pcidev; diff --git a/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h b/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h index b76f877f250a..49141b3558e1 100644 --- a/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h +++ b/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h @@ -254,6 +254,9 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) pci_for_each_dev(pcidev) { if (pcidev->vendor == pci_vendor) { amcc = kmalloc(sizeof(*amcc), GFP_KERNEL); + if (amcc == NULL) + continue; + memset(amcc, 0, sizeof(*amcc)); amcc->pcidev = pcidev; -- 2.11.0