cxgb4/cxgb4vf: Fix mac_hlist initialization and free

[ Upstream commit b539ea60f5043b9acd7562f04fa2117f18776cbb ]

Null pointer dereference seen when cxgb4vf driver is unloaded
without bringing up any interfaces, moving mac_hlist initialization
to driver probe and free the mac_hlist in remove to fix the issue.

Fixes: 24357e06ba51 ("cxgb4vf: fix memleak in mac_hlist initialization")
Signed-off-by: Arjun Vynipadath <arjun@chelsio.com>
Signed-off-by: Casey Leedom <leedom@chelsio.com>
Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 821f68baa55ccf1e79dfd3905eaece784a366b0a..54b5f61c8ed9285bfa8fe3c95b3c1cc3224b90e8 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2236,8 +2236,6 @@ static int cxgb_up(struct adapter *adap)
 #if IS_ENABLED(CONFIG_IPV6)
        update_clip(adap);
 #endif
-       /* Initialize hash mac addr list*/
-       INIT_LIST_HEAD(&adap->mac_hlist);
        return err;
 
  irq_err:
@@ -2251,8 +2249,6 @@ static int cxgb_up(struct adapter *adap)
 
 static void cxgb_down(struct adapter *adapter)
 {
-       struct hash_mac_addr *entry, *tmp;
-
        cancel_work_sync(&adapter->tid_release_task);
        cancel_work_sync(&adapter->db_full_task);
        cancel_work_sync(&adapter->db_drop_task);
@@ -2262,11 +2258,6 @@ static void cxgb_down(struct adapter *adapter)
        t4_sge_stop(adapter);
        t4_free_sge_resources(adapter);
 
-       list_for_each_entry_safe(entry, tmp, &adapter->mac_hlist, list) {
-               list_del(&entry->list);
-               kfree(entry);
-       }
-
        adapter->flags &= ~FULL_INIT_DONE;
 }
 
@@ -4797,6 +4788,9 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                             (is_t5(adapter->params.chip) ? STATMODE_V(0) :
                              T6_STATMODE_V(0)));
 
+       /* Initialize hash mac addr list */
+       INIT_LIST_HEAD(&adapter->mac_hlist);
+
        for_each_port(adapter, i) {
                netdev = alloc_etherdev_mq(sizeof(struct port_info),
                                           MAX_ETH_QSETS);
@@ -5075,6 +5069,7 @@ sriov:
 static void remove_one(struct pci_dev *pdev)
 {
        struct adapter *adapter = pci_get_drvdata(pdev);
+       struct hash_mac_addr *entry, *tmp;
 
        if (!adapter) {
                pci_release_regions(pdev);
@@ -5113,6 +5108,12 @@ static void remove_one(struct pci_dev *pdev)
                if (adapter->num_uld || adapter->num_ofld_uld)
                        t4_uld_mem_free(adapter);
                free_some_resources(adapter);
+               list_for_each_entry_safe(entry, tmp, &adapter->mac_hlist,
+                                        list) {
+                       list_del(&entry->list);
+                       kfree(entry);
+               }
+
 #if IS_ENABLED(CONFIG_IPV6)
                t4_cleanup_clip_tbl(adapter);
 #endif

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 9eb3071b69a42a49e7902a91b3744e0861374f47..17db5be9d2b7ac93c03b264ca06c48b202566145 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -719,9 +719,6 @@ static int adapter_up(struct adapter *adapter)
                if (adapter->flags & USING_MSIX)
                        name_msix_vecs(adapter);
 
-               /* Initialize hash mac addr list*/
-               INIT_LIST_HEAD(&adapter->mac_hlist);
-
                adapter->flags |= FULL_INIT_DONE;
        }
 
@@ -2902,6 +2899,9 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
        if (err)
                goto err_unmap_bar;
 
+       /* Initialize hash mac addr list */
+       INIT_LIST_HEAD(&adapter->mac_hlist);
+
        /*
         * Allocate our "adapter ports" and stitch everything together.
         */