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 66DD0EEB562 for ; Fri, 8 Sep 2023 18:26:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344460AbjIHS0D (ORCPT ); Fri, 8 Sep 2023 14:26:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344381AbjIHSZ0 (ORCPT ); Fri, 8 Sep 2023 14:25:26 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 253974EE4; Fri, 8 Sep 2023 11:22:21 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9CDCC433BD; Fri, 8 Sep 2023 18:13:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694196822; bh=mt63fNNqdh6V8HJeH/KE+/X8rGYBDXwyh87BiWzi/Xg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o16llmBaApwk2EttYd/z3D9Gj5FYISltnJ+aBgXZ06Piqa1Os+K7YHeKmVeGGvEu3 nmXk63oM9qeW7ZVmqCSwcSAvfu7vJ4c9JTgGfA96CdtCPHGtVujn1bTdbgd9+nhIT6 SiDUvTc73+UT2d/qqhHQT3G2aXADw7/+tREfdvgNQgsGfp5qWIMz1x0qXOhAetxHIg fI+DZiPpwCE06IhDp81qrZp9UmI/3E6kAmxozzTivEsPJMimBo1MMwxTfzFpHXdIh2 PsjtO54+ZGzzQQY81wWETPjgWn4CKf9y+CTeO3HvHs2Hmb4p1jSLeFOL7zBmIAkeyK SCkr24Cyf7POw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wojciech Drewek , Paul Menzel , Simon Horman , Sujai Buvaneswaran , Tony Nguyen , Sasha Levin , jesse.brandeburg@intel.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.5 06/45] ice: Don't tx before switchdev is fully configured Date: Fri, 8 Sep 2023 14:12:47 -0400 Message-Id: <20230908181327.3459042-6-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908181327.3459042-1-sashal@kernel.org> References: <20230908181327.3459042-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.2 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wojciech Drewek [ Upstream commit 7aa529a69e92b9aff585e569d5003f7c15d8d60b ] There is possibility that ice_eswitch_port_start_xmit might be called while some resources are still not allocated which might cause NULL pointer dereference. Fix this by checking if switchdev configuration was finished. Reviewed-by: Paul Menzel Reviewed-by: Simon Horman Signed-off-by: Wojciech Drewek Tested-by: Sujai Buvaneswaran Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_eswitch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch.c b/drivers/net/ethernet/intel/ice/ice_eswitch.c index 8f232c41a89e3..459e32f6adb50 100644 --- a/drivers/net/ethernet/intel/ice/ice_eswitch.c +++ b/drivers/net/ethernet/intel/ice/ice_eswitch.c @@ -331,6 +331,9 @@ ice_eswitch_port_start_xmit(struct sk_buff *skb, struct net_device *netdev) np = netdev_priv(netdev); vsi = np->vsi; + if (!vsi || !ice_is_switchdev_running(vsi->back)) + return NETDEV_TX_BUSY; + if (ice_is_reset_in_progress(vsi->back->state) || test_bit(ICE_VF_DIS, vsi->back->state)) return NETDEV_TX_BUSY; -- 2.40.1