From 077c28f8c2f6d375bb7927c1f909df810776647b Mon Sep 17 00:00:00 2001 From: Mark Hounschell Date: Wed, 23 Apr 2014 10:33:44 -0400 Subject: [PATCH] staging: dgap: Fix how we insure config data is a string This patch changes the way we insure the config data is a string. Clearly this was just wrong. After a certain number of loads/unloads various OOPs were generated indicating something other than this driver had a problem. It was this driver. Signed-off-by: Mark Hounschell Tested-by: Mark Hounschell Reported-by: Mark Hounschell Signed-off-by: Greg Kroah-Hartman --- drivers/staging/dgap/dgap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 3c9278a224e2..e0b8d0f051cc 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -834,7 +834,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type) return ret; } - dgap_config_buf = kmalloc(fw->size + 1, GFP_KERNEL); + dgap_config_buf = kzalloc(fw->size + 1, GFP_KERNEL); if (!dgap_config_buf) { release_firmware(fw); return -ENOMEM; @@ -842,7 +842,6 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type) memcpy(dgap_config_buf, fw->data, fw->size); release_firmware(fw); - dgap_config_buf[fw->size + 1] = '\0'; if (dgap_parsefile(&dgap_config_buf, TRUE) != 0) { kfree(dgap_config_buf); -- 2.11.0