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 2C40733F399 for ; Tue, 31 Mar 2026 16:00:18 +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=1774972818; cv=none; b=AFHA3XvjDFmTGCAPr0LVyEEMATxlBgWv1hAzOamRvXUfTncNeMS+hnKsLE31Cm6KCeaZCz3jJJ5SSmEUk2m37koqDs9I9yhscvqBNKGesb+xu6LD0aFMpFgfLveEc4FxqVw9IH9PDpkFVl0aMyBHoyYRyKjabXMm9QYQxEbA2ZY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774972818; c=relaxed/simple; bh=8xkcmqcXJmmiDltGTeWwOvYRHEW1eXf7YYFz5p1BRJ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BjdPvX/EP3Nap/l3dU5XUl5m+5XKqlk1z+gdCfvnLVvYZ6ywDZDdkPLD/2TpMoZCsutNZoWaJd8eyszqaeklZqW66wCzT2WwvBskmQx2xeIH0hy+0VqeH86zYw1UgnyW5Uno9rwP1BcNBL/4fOZkIkbycyW8J3O81OcZbvR5bhU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HfNYL3td; 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="HfNYL3td" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FCFDC19423; Tue, 31 Mar 2026 16:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774972818; bh=8xkcmqcXJmmiDltGTeWwOvYRHEW1eXf7YYFz5p1BRJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HfNYL3td+M6N6FfUJvB6Z4VS6wV65WD7fK/AND1vNnJmM+iALD1/FVtSCH/i2/O21 cRqM3NAI43ZztmD5X+Oh49WPGm9g/j6WlsTlHIJMynXP+TFT0lnc0ZUiECa/xZ40nM uVmElIId536LCrPW8HLCPhqJY1YhwIn58O9MV0iyzDBaZoBwu9Y1xd/GtgNCx/okds eKrX9u7ykaePKX3r5IjaHaY0mDIeverERhaOhMRn97leZ/0DkxsatFjWYN8fpb0Bwz r/4yZ9rhEobvPWLCzJwOEACmBNqhRqVJxDArz0S8UMwisKCSBO7AhU08PuxtvdpJ19 MZjfwtc/nDmcg== From: Sasha Levin To: stable@vger.kernel.org Cc: Guangshuo Li , Long Li , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.19.y] net: mana: fix use-after-free in add_adev() error path Date: Tue, 31 Mar 2026 12:00:15 -0400 Message-ID: <20260331160015.2677476-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026033040-marauding-puma-a849@gregkh> References: <2026033040-marauding-puma-a849@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 4a616a97d89d5..14f44b71daded 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -3376,6 +3376,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) @@ -3385,7 +3386,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; @@ -3411,7 +3413,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