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 smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 36ABFC4332F for ; Sun, 18 Dec 2022 16:23:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DD7BB6061B; Sun, 18 Dec 2022 16:23:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org DD7BB6061B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1671380613; bh=hi1wzw6wxImnUrrIRG7i5HWiooQOrANGVRZMc6BLcUg=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=60Q5dGCrlkE4I9alkZnOQ636oIKJ8Y24qNWUvzAiSBkNoARJCBLRisH/BlQ5/W76E 2PRnj7WUS55nt29paULS94W/8ngJsR75hYXT0Haly6UrNS8SS48aufiaj7BaBgR7eR N6UP6BYZ92qoQiqeG1KNmy5huuikA5nI49qMvIbCjgOeN4P/NsnDz5QcIyktA1q2H5 A2PrV2L9A1k5P8DfwzZ9o/h8bWb+R2esh0pC1zR0pT7GYoixuenrR3oP/KPxlYK3yX rWsTsiuXOrvNyntSUhxKzZNq0OTk8PogDENi4NSclAQYz831OvDSWHu/7vAsflLtZ6 JllIIN2PRWh5w== X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d8gVy00SBs5w; Sun, 18 Dec 2022 16:23:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 01B2060A81; Sun, 18 Dec 2022 16:23:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 01B2060A81 Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 4E4CC1BF3A3 for ; Sun, 18 Dec 2022 16:23:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2840960A81 for ; Sun, 18 Dec 2022 16:23:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 2840960A81 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CYsA5sPYCTHt for ; Sun, 18 Dec 2022 16:23:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 59F346061B Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by smtp3.osuosl.org (Postfix) with ESMTPS id 59F346061B for ; Sun, 18 Dec 2022 16:23:30 +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 AAE71B80BA7; Sun, 18 Dec 2022 16:23:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17A71C433D2; Sun, 18 Dec 2022 16:23:26 +0000 (UTC) From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Date: Sun, 18 Dec 2022 11:22:52 -0500 Message-Id: <20221218162305.935724-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221218162305.935724-1-sashal@kernel.org> References: <20221218162305.935724-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=1671380607; bh=VakV6NWYyoDAL3aJMqaoBAEhLsNBck/45qgFfLzV3kY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uquYufEZVLYQpN6qudKcQWEGOZOcwt4s3qp9VXOMgCoP4Cgyr2tCv4D7a53eOXbol IjwWmGymblhWbXrOspZ5ik111FoAQUX4kpdG05RaN9ixSR8Altl+NQGw3WUcwulgLH KSbBIcHzjefRI0ahPKQDXRsyQtvzni4LAm4hUY/nBIMePyfDy9aC+71iUOjvXsigTe ktUhHr37sljgNb2Z7NggiwLVE+fkfOYRwhNrP5kymifqBc2U3LjYLWiROO7VoegzrR sshpkys8dSCiKs205/Foz81OBik053/sQeazoqlmkEgyZQNTvyCybDiKPprRweTyt0 9iSVjhCbbeBsQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=uquYufEZ Subject: [Intel-wired-lan] [PATCH AUTOSEL 4.9 07/20] 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 2e713e5f75cd..bbca786f0427 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -1219,8 +1219,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