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 11075C4332F for ; Sun, 18 Dec 2022 16:19:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id B8C5060008; Sun, 18 Dec 2022 16:19:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B8C5060008 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1671380358; bh=k/0+I26zi/POjc2D6ts/RiJQh7+9MmGT00XuTcGrUqA=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=ycQJbecqSg7HBQbwx0ZzeAXZLkpohNU/P9tONdPuzdJ0CM/uZoAJA0wkkqonZo8pe o1EqZq3/UHu8JexyRAeaKLDMsKzeIl1zpovNgo9d8QG+j7KfF8+vTjMzaeA7RNzUi3 no9JlkaSdUpNNLrGy/1JhZ2hSRUnJX2l1Pbgd5RxjAW/1HG//JdmkhmtuLURYKUs30 LVuZJZsF0NtGDSRKkzV3sTx/1wycw2j1hY9/8uY7NtQb1jHBsauL3njB2vFozp1AOE JmiuMmK/+euGXDbMXsGQlNYa/xZeIm1dj/dj+gIvVQNrwa+V2KGUwA1tPBM2ADmVWP 33MfywQUeV5tw== 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 oPmEUJp-lx3m; Sun, 18 Dec 2022 16:19:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id B319D6061B; Sun, 18 Dec 2022 16:19:17 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B319D6061B Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4F4FC1BF3A3 for ; Sun, 18 Dec 2022 16:19:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 34D0240576 for ; Sun, 18 Dec 2022 16:19:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 34D0240576 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 kiZnGXqKZqon for ; Sun, 18 Dec 2022 16:19:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5B873404ED Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by smtp4.osuosl.org (Postfix) with ESMTPS id 5B873404ED for ; Sun, 18 Dec 2022 16:19: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 dfw.source.kernel.org (Postfix) with ESMTPS id BBFE860C99; Sun, 18 Dec 2022 16:19:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20E32C43443; Sun, 18 Dec 2022 16:19:13 +0000 (UTC) From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Date: Sun, 18 Dec 2022 11:18:16 -0500 Message-Id: <20221218161836.933697-11-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221218161836.933697-1-sashal@kernel.org> References: <20221218161836.933697-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=1671380354; bh=CYFCy9x7yJd5X+PG94szVTvrV8aExaRAAvBUGpgSx+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KyFxveIJQLGJjre3/vpYJ2PJ1Tvww7is3O6a5/h3qqrklsymnJ5qWPh5k6z1swNvG 8bLc4l+rUEr7VXNL4CY/3uxxPf6csZuoYFAfrY7DCXmwa95/ie+B57HMEw9aoY5CBN /fOGrohdwbm3NNc/XjX7io6Ehrg7tyVa947hQnr0cJC84h8TIS1mflSF1bKqIFEfS+ niNvf5HXVf+uBYfFuP9bxmKGvaYBj9AqZd60gSxOdxgvbxRPmTMxF1Yl1cRYXP6fAl QPbQdJGaxNHP4qYJ85RitzJ3UdJgipQ/Rp2Bi72fQ0jKNUUvmIZtGTzNTQ1gIVGbBI 9V2z/2dGqkrpQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=KyFxveIJ Subject: [Intel-wired-lan] [PATCH AUTOSEL 5.4 11/30] 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 f718eadd8774..666676445d57 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -1213,8 +1213,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