Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0DAB9C4332F for ; Sun, 18 Dec 2022 16:09:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A1DF140918; Sun, 18 Dec 2022 16:09:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A1DF140918 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1671379759; bh=2c5opwGmDpkGyg7bncAP3zTx9Fy7nWSZLK01zw5MC80=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=Uny1k5IpmOT5yMu/KAd9azx55yTcgcT6RcNZL+b6/ZFO3w1VdPRUqvR54dRvzYzY4 vbKpcVK672F/tEtMjcma7f+rf/FpyKekq2UJ0yeHp5YEuKmuztBdklYwEe5n+3uX8k ycu+MU/UPZbz6/ku6573deoGOBN0QZx8aHn/bEy8AYVEgAdsLdM1U1ij6H9mCkqVO8 s4dd84xrfYI1AFqNrYjLFqwAvxKwEbnDhA5k/+OsKBGFnVnB+hwCb33HoxTMGEBb7/ YpFQEAAolARJ5EwbqkVo3RNIK1FkYfjo/CyIE12qXo+o1vcc9Wl9njsr73AF/J9dYm b6VWIs2x2mw6Q== X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U9DGf3xUDJJx; Sun, 18 Dec 2022 16:09:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 6C785408F4; Sun, 18 Dec 2022 16:09:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6C785408F4 Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CEE6C1BF3A3 for ; Sun, 18 Dec 2022 16:09:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B624380B59 for ; Sun, 18 Dec 2022 16:09:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B624380B59 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X6Rjz-GefWaw for ; Sun, 18 Dec 2022 16:09:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 04D1980B57 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by smtp1.osuosl.org (Postfix) with ESMTPS id 04D1980B57 for ; Sun, 18 Dec 2022 16:09:15 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 311F1B803F1; Sun, 18 Dec 2022 16:09:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61497C433D2; Sun, 18 Dec 2022 16:09:11 +0000 (UTC) From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Date: Sun, 18 Dec 2022 11:06:53 -0500 Message-Id: <20221218160741.927862-25-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221218160741.927862-1-sashal@kernel.org> References: <20221218160741.927862-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671379752; bh=DFaV2Rh52BNZIwNztmOcMLb8eRv5d5fEaA3prV5aXxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R0sKvgBpNxT5pIe5itT7RwNJJroSl21kJjGxteTYVg1uIQZj076Md+SrctsRSkHAc mOQc34/T36nf0IQaxPfbt32e8Rkk0pjyqhjbcsmXggkr9eklBVxXFy14bYhN8Q1jt+ Bo0HbV4aKtz7qVxyXc6WeYvjyAT/JYSzrEm9POqJ8wv9KyYCh26MxAraiQ8DHSwRHG SN/F8DJn8Aj3q1vnKzrLPe79ys9AGGloKtHLjn6z+NYE7xAseu2Z3nm9ZUEkAt3nZz oqOYnVFex6vVy9yogMHsGC9oqRvNw1QaHtPMiSN9qx4JSMTPkFCfsakhrBFV+m1Qgl J5txk1g9SLqng== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=R0sKvgBp Subject: [Intel-wired-lan] [PATCH AUTOSEL 6.0 25/73] igb: Do not free q_vector unless new one was allocated X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Kees Cook , intel-wired-lan@lists.osuosl.org, Jesse Brandeburg , "Michael J . Ruhl" , Eric Dumazet , Tony Nguyen , netdev@vger.kernel.org, Jakub Kicinski , Paolo Abeni , "David S. Miller" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Kees Cook [ Upstream commit 0668716506ca66f90d395f36ccdaebc3e0e84801 ] Avoid potential use-after-free condition under memory pressure. If the kzalloc() fails, q_vector will be freed but left in the original adapter->q_vector[v_idx] array position. Cc: Jesse Brandeburg Cc: Tony Nguyen Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: Michael J. Ruhl Reviewed-by: Jacob Keller Tested-by: Gurucharan (A Contingent worker at Intel) Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/igb/igb_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 2796e81d2726..5f3a35b217b7 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -1202,8 +1202,12 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter, if (!q_vector) { q_vector = kzalloc(size, GFP_KERNEL); } else if (size > ksize(q_vector)) { - kfree_rcu(q_vector, rcu); - q_vector = kzalloc(size, GFP_KERNEL); + struct igb_q_vector *new_q_vector; + + new_q_vector = kzalloc(size, GFP_KERNEL); + if (new_q_vector) + kfree_rcu(q_vector, rcu); + q_vector = new_q_vector; } else { memset(q_vector, 0, size); } -- 2.35.1 _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan@osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan