]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
igb: Fix a memory leak in igb_probe
authorJia-Ju Bai <baijiaju1990@163.com>
Wed, 5 Aug 2015 14:05:16 +0000 (22:05 +0800)
committerKirtikar Kashyap <kirtikar.kashyap@oracle.com>
Thu, 22 Jun 2017 21:28:29 +0000 (14:28 -0700)
In error handling code of igb_probe, the memory adapter->shadow_vfta
allocated by kcalloc in igb_sw_init is not freed. So when register_netdev
or igb_init_i2c is failed, a memory leak will occur.
This patch adds kfree to fix it.

Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 42ad1a03b4caf4d95b980bce17c46242e6728ddc)

Orabug: 26325580

Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
drivers/net/ethernet/intel/igb/igb_main.c

index 40211015649a533deb1ee72f39e287f2b38dd6c3..1a935588e2896a8c4498db86400a07316be0d54e 100644 (file)
@@ -2649,6 +2649,7 @@ err_eeprom:
        if (hw->flash_address)
                iounmap(hw->flash_address);
 err_sw_init:
+       kfree(adapter->shadow_vfta);
        igb_clear_interrupt_scheme(adapter);
        pci_iounmap(pdev, hw->hw_addr);
 err_ioremap: