From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7D235371D0A; Fri, 3 Apr 2026 07:10:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775200212; cv=none; b=D5SB+o4qxRSyfzojCotR6IBtrbe8q8NCsmIMsHiYV+BnhfNfPPaQLmeT+VK48u3fmgStkaeqe1t/cH0qcLyE9aJgsMzN1eLGKlBiVVbQ1udy73aSP8sr+orCaIozJMUfYHjYrK16C7HOsiA7PboY4CjacfTwGr3Z9IkeSaJ18ik= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775200212; c=relaxed/simple; bh=0xgmDKsYqvacVPJ5rAhhSR5GcmWBrkLwMvk88WuI3wA=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EBpcalF/Gpvedn+spGXSmWaqZTolq/FMfxJhZtd1gLlGV1JHRCNKIDKhHm3/u1ZeIxTwJ+jqOznpiX8PN4/mqzdhTqW7EphMhvu6iJwF9mUbGVc2+Wz9eTYyuq7N4FcUZbeYahkHEZBDKPYTpBl7KQgDSasaOyXWk2DyjNARaNU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=ijDI2HQz; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="ijDI2HQz" Received: by linux.microsoft.com (Postfix, from userid 1173) id 49ACE20B6F01; Fri, 3 Apr 2026 00:10:11 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 49ACE20B6F01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1775200211; bh=OhD1X2monvqAOmG8Rm0rzvQIucQdiJXg2CJjthghJMc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ijDI2HQzy63xMFPJYQulCH40OfUEVPMSO5+fAEb7rp4sW9wKsU+1sqLCbv3IiUfZr FVApKiIl2PPD8yfXRcOT9j9+G4Lq4xOjbKHQt1XdBjE9vsboOfVdwgp4zc7Uva/fd7 axlzIZ7Ib0X3xYz2IzRk3DcBBoTYZxLjrtkz2V3g= From: Erni Sri Satya Vennela To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, longli@microsoft.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ernis@linux.microsoft.com, ssengar@linux.microsoft.com, dipayanroy@linux.microsoft.com, gargaditya@linux.microsoft.com, shirazsaleem@microsoft.com, kees@kernel.org, kotaranov@microsoft.com, leon@kernel.org, shacharr@microsoft.com, stephen@networkplumber.org, linux-hyperv@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 4/4] net: mana: Fix EQ leak in mana_remove on NULL port Date: Fri, 3 Apr 2026 00:09:43 -0700 Message-ID: <20260403070948.9225-5-ernis@linux.microsoft.com> X-Mailer: git-send-email 2.43.7 In-Reply-To: <20260403070948.9225-1-ernis@linux.microsoft.com> References: <20260403070948.9225-1-ernis@linux.microsoft.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: ca9c54d2d6a5 ("net: mana: Add a driver for Microsoft Azure Network Adapter (MANA)") Signed-off-by: Erni Sri Satya Vennela --- drivers/net/ethernet/microsoft/mana/mana_en.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 1a141c46ac27..97237d137cbf 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -3747,7 +3747,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); @@ -3778,7 +3778,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; -- 2.34.1