From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E28ABC3DA79 for ; Sun, 18 Dec 2022 17:11:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233635AbiLRRLO (ORCPT ); Sun, 18 Dec 2022 12:11:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233554AbiLRRJW (ORCPT ); Sun, 18 Dec 2022 12:09:22 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16FEB1E734; Sun, 18 Dec 2022 08:23:30 -0800 (PST) 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 BFD7AB80BAA; 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) 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== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kees Cook , Jesse Brandeburg , Tony Nguyen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, "Michael J . Ruhl" , Jacob Keller , Gurucharan , Sasha Levin Subject: [PATCH AUTOSEL 4.9 07/20] igb: Do not free q_vector unless new one was allocated 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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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