From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40315266581 for ; Tue, 31 Mar 2026 16:30:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774974642; cv=none; b=sQiubvy3DUloAE5/bOaaXEIyiV+d3slbelcVRHIH4IhmvOPxorN37X580ygjSdnEbVVbg/n7xR3GMk8DZ1s3OTmks7t6rCgUJwy5qEXvXLHtpWNwNjPC00LkgBICchcdUF6j+gxcS/n3NE0QrvFVZm6HUN0jN5rMczb15d7YCnI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774974642; c=relaxed/simple; bh=ncL2O2t3igaQYXd/TYF8EXwxsPqeAWgQPl+l62SYSaI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dx2WJHTq87M5/8HjX3/KR/NycvVMygzxpTbfR41lrbLbR3PrsV6nN5obMRCWqfwjcnYL4VccM9HNO0pp1ua2+UKZ5bgP2yj5oFp85hdSAT4eMNLCuxWac4HDf8+hhbfLTqlcHoY/wR7VI+K+3hDkDqvmG/Jqr2peV+7Ng6bPrbg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tBDIB0mT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tBDIB0mT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A496C2BCB4; Tue, 31 Mar 2026 16:30:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774974642; bh=ncL2O2t3igaQYXd/TYF8EXwxsPqeAWgQPl+l62SYSaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tBDIB0mTqMKpbwPIYMKGw1zlTvgfZWVJYruyE4svocv3r+71MrFV9mowTFr1FVhsC EmKUcgRuh1k8G55Dq8P45/aq/GC9GzHeHnFpaLhyRFSbXIIVw0D9DhYP4DzTz28Mi/ cWK+80IBi+yQ0AdcnM/ql4yX+yD6H8BUf7Ig8h6vMFI47OoYbr7CTxnYxPvjbFo8Nb rNS7AX7k/iIv4QLlaCq8UzPWaJsvTBl0D6vjDBOjj/pK4fCmiGL73z1/yhAKzcd7aW 8VuCrYBgaUFSuKvZMifcWxGS7P0NfxjuUZ+u7SWvzTQC14dJn00lhSowQRUC+qWX7E w2M2+IMJUnZzQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Guangshuo Li , Long Li , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18.y] net: mana: fix use-after-free in add_adev() error path Date: Tue, 31 Mar 2026 12:30:38 -0400 Message-ID: <20260331163038.2733327-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026033041-settle-wackiness-fce1@gregkh> References: <2026033041-settle-wackiness-fce1@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Guangshuo Li [ Upstream commit c4ea7d8907cf72b259bf70bd8c2e791e1c4ff70f ] If auxiliary_device_add() fails, add_adev() jumps to add_fail and calls auxiliary_device_uninit(adev). The auxiliary device has its release callback set to adev_release(), which frees the containing struct mana_adev. Since adev is embedded in struct mana_adev, the subsequent fall-through to init_fail and access to adev->id may result in a use-after-free. Fix this by saving the allocated auxiliary device id in a local variable before calling auxiliary_device_add(), and use that saved id in the cleanup path after auxiliary_device_uninit(). Fixes: a69839d4327d ("net: mana: Add support for auxiliary device") Cc: stable@vger.kernel.org Reviewed-by: Long Li Signed-off-by: Guangshuo Li Link: https://patch.msgid.link/20260323165730.945365-1-lgs201920130244@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/microsoft/mana/mana_en.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 50d4437a518fd..a201fcf0ddbc9 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -3295,6 +3295,7 @@ static int add_adev(struct gdma_dev *gd, const char *name) struct auxiliary_device *adev; struct mana_adev *madev; int ret; + int id; madev = kzalloc(sizeof(*madev), GFP_KERNEL); if (!madev) @@ -3304,7 +3305,8 @@ static int add_adev(struct gdma_dev *gd, const char *name) ret = mana_adev_idx_alloc(); if (ret < 0) goto idx_fail; - adev->id = ret; + id = ret; + adev->id = id; adev->name = name; adev->dev.parent = gd->gdma_context->dev; @@ -3330,7 +3332,7 @@ static int add_adev(struct gdma_dev *gd, const char *name) auxiliary_device_uninit(adev); init_fail: - mana_adev_idx_free(adev->id); + mana_adev_idx_free(id); idx_fail: kfree(madev); -- 2.53.0