igb: Fix potential invalid memory access in igb_init_module()

[ Upstream commit 0566f83d206c7a864abcd741fe39d6e0ae5eef29 ]

The pci_register_driver() can fail and when this happened, the dca_notifier
needs to be unregistered, otherwise the dca_notifier can be called when
igb fails to install, resulting to invalid memory access.

Fixes: bbd98fe48a43 ("igb: Fix DCA errors and do not use context index for 82576")
Signed-off-by: Yuan Can <yuancan@huawei.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index f3a433b4c7cdb1d2ab9d8890d341d31e88eb0f99..7712df5b9314778b5115d77f9c0e8469ed606d94 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -667,6 +667,10 @@ static int __init igb_init_module(void)
        dca_register_notify(&dca_notifier);
 #endif
        ret = pci_register_driver(&igb_driver);
+#ifdef CONFIG_IGB_DCA
+       if (ret)
+               dca_unregister_notify(&dca_notifier);
+#endif
        return ret;
 }