Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pm8001: more fixes to honor return value

The driver ignores the return value in a lot of places, fix
it at least somewhere (and release the resources in such cases),
to avoid that bad things happen.
A memory leak is fixed too.

Signed-off-by: Tomas Henzl <thenzl@redhat.com>
Acked-by: Suresh Thiagarajan <Suresh.Thiagarajan@pmcs.com>
Acked-by: Jack Wang <xjtuwjp@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

authored by

Tomas Henzl and committed by
Christoph Hellwig
5b4ce882 646cdf00

+24 -3
+4 -1
drivers/scsi/pm8001/pm8001_ctl.c
··· 397 397 payload.func_specific = kzalloc(4096, GFP_KERNEL); 398 398 if (!payload.func_specific) 399 399 return -ENOMEM; 400 - PM8001_CHIP_DISP->get_nvmd_req(pm8001_ha, &payload); 400 + if (PM8001_CHIP_DISP->get_nvmd_req(pm8001_ha, &payload)) { 401 + kfree(payload.func_specific); 402 + return -ENOMEM; 403 + } 401 404 wait_for_completion(&completion); 402 405 virt_addr = pm8001_ha->memoryMap.region[NVMD].virt_ptr; 403 406 for (bios_index = BIOSOFFSET; bios_index < BIOS_OFFSET_LIMIT;
+20 -2
drivers/scsi/pm8001/pm8001_init.c
··· 622 622 DECLARE_COMPLETION_ONSTACK(completion); 623 623 struct pm8001_ioctl_payload payload; 624 624 u16 deviceid; 625 + int rc; 626 + 625 627 pci_read_config_word(pm8001_ha->pdev, PCI_DEVICE_ID, &deviceid); 626 628 pm8001_ha->nvmd_completion = &completion; 627 629 ··· 641 639 } 642 640 payload.offset = 0; 643 641 payload.func_specific = kzalloc(payload.length, GFP_KERNEL); 644 - PM8001_CHIP_DISP->get_nvmd_req(pm8001_ha, &payload); 642 + if (!payload.func_specific) { 643 + PM8001_INIT_DBG(pm8001_ha, pm8001_printk("mem alloc fail\n")); 644 + return; 645 + } 646 + rc = PM8001_CHIP_DISP->get_nvmd_req(pm8001_ha, &payload); 647 + if (rc) { 648 + kfree(payload.func_specific); 649 + PM8001_INIT_DBG(pm8001_ha, pm8001_printk("nvmd failed\n")); 650 + return; 651 + } 645 652 wait_for_completion(&completion); 646 653 647 654 for (i = 0, j = 0; i <= 7; i++, j++) { ··· 673 662 pm8001_printk("phy %d sas_addr = %016llx\n", i, 674 663 pm8001_ha->phy[i].dev_sas_addr)); 675 664 } 665 + kfree(payload.func_specific); 676 666 #else 677 667 for (i = 0; i < pm8001_ha->chip->n_phy; i++) { 678 668 pm8001_ha->phy[i].dev_sas_addr = 0x50010c600047f9d0ULL; ··· 697 685 /*OPTION ROM FLASH read for the SPC cards */ 698 686 DECLARE_COMPLETION_ONSTACK(completion); 699 687 struct pm8001_ioctl_payload payload; 688 + int rc; 700 689 701 690 pm8001_ha->nvmd_completion = &completion; 702 691 /* SAS ADDRESS read from flash / EEPROM */ ··· 708 695 if (!payload.func_specific) 709 696 return -ENOMEM; 710 697 /* Read phy setting values from flash */ 711 - PM8001_CHIP_DISP->get_nvmd_req(pm8001_ha, &payload); 698 + rc = PM8001_CHIP_DISP->get_nvmd_req(pm8001_ha, &payload); 699 + if (rc) { 700 + kfree(payload.func_specific); 701 + PM8001_INIT_DBG(pm8001_ha, pm8001_printk("nvmd failed\n")); 702 + return -ENOMEM; 703 + } 712 704 wait_for_completion(&completion); 713 705 pm8001_set_phy_profile(pm8001_ha, sizeof(u8), payload.func_specific); 714 706 kfree(payload.func_specific);