If netdev registration fails after I2C setup, err_register clears the
embedded adapter without unregistering it. I2C clients and the adapter
registration outlive the freed netdev.
Delete the registered adapter instead of clearing its storage.
This issue was found by our static analysis tool under development.
Fixes: 441fc6fdb47a ("igb: Add i2c interface to igb.")
Signed-off-by: Guangshuo Li <redacted>
---
drivers/net/ethernet/intel/igb/igb_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index d4a897a8c82c..ffb696500d9c 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3657,7 +3657,8 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_register:
igb_release_hw_control(adapter);
- memset(&adapter->i2c_adap, 0, sizeof(adapter->i2c_adap));
+ if (adapter->i2c_adap.dev.parent)
+ i2c_del_adapter(&adapter->i2c_adap);
err_eeprom:
if (!igb_check_reset_block(hw))
igb_reset_phy(hw);
base-commit: 2e54b3e187300893688c2c7517894f5d96732e05