]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: mana: Fix EQ leak in mana_remove on NULL port
authorErni Sri Satya Vennela <ernis@linux.microsoft.com>
Mon, 20 Apr 2026 12:47:39 +0000 (05:47 -0700)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 23 Apr 2026 10:49:13 +0000 (12:49 +0200)
In mana_remove(), when a NULL port is encountered in the port iteration
loop, 'goto out' skips the mana_destroy_eq(ac) call, leaking the event
queues allocated earlier by mana_create_eq().

This can happen when mana_probe_port() fails for port 0, leaving
ac->ports[0] as NULL. On driver unload or error cleanup, mana_remove()
hits the NULL entry and jumps past mana_destroy_eq().

Change 'goto out' to 'break' so the for-loop exits normally and
mana_destroy_eq() is always reached. Remove the now-unreferenced out:
label.

Fixes: 1e2d0824a9c3 ("net: mana: Add support for EQ sharing")
Signed-off-by: Erni Sri Satya Vennela <ernis@linux.microsoft.com>
Link: https://patch.msgid.link/20260420124741.1056179-6-ernis@linux.microsoft.com
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/microsoft/mana/mana_en.c

index 39b18577fb51292bed58bf4c77b6dfdbc16b455e..98e2fcc797cac9420a5470dc6f4a1ddbdfcaa554 100644 (file)
@@ -3752,7 +3752,7 @@ void mana_remove(struct gdma_dev *gd, bool suspending)
                if (!ndev) {
                        if (i == 0)
                                dev_err(dev, "No net device to remove\n");
-                       goto out;
+                       break;
                }
 
                apc = netdev_priv(ndev);
@@ -3783,7 +3783,7 @@ void mana_remove(struct gdma_dev *gd, bool suspending)
        }
 
        mana_destroy_eq(ac);
-out:
+
        if (ac->per_port_queue_reset_wq) {
                destroy_workqueue(ac->per_port_queue_reset_wq);
                ac->per_port_queue_reset_wq = NULL;