From patchwork Mon Aug 3 12:20:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 266859 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88DF8C433E0 for ; Mon, 3 Aug 2020 12:37:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 59366204EC for ; Mon, 3 Aug 2020 12:37:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596458261; bh=+D69VU/8W6HDpsGPpasDKXI0ZDZ5s3tsLfmLnnpGem4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=W3kFXtXXSbyTXoK3j9wX1kYveKDSfaxcCmRDj2jiRVPxMMD8E52bS7w9oONx1pAn2 yegsH7i9g1X9UMyAq35t+vH7qU1S0Drc45gSxAxtWiQjbLizB8ALw2rIinMkRQXdB5 BW666QumoCOX6SLLyHTHP2Q3umfgtXAQhCc32ehw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727991AbgHCMhf (ORCPT ); Mon, 3 Aug 2020 08:37:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:35042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727850AbgHCMer (ORCPT ); Mon, 3 Aug 2020 08:34:47 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AE41620781; Mon, 3 Aug 2020 12:34:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596458086; bh=+D69VU/8W6HDpsGPpasDKXI0ZDZ5s3tsLfmLnnpGem4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iPYg5risirwOVIVXbeEnyX/6Ggd2l0J1dmbEeQ527R3klNpUQfeFN29rM1mEMqgg2 VNCBwCBBAhcemro3eIISxRAEiFIWM/rRXZiMxKXpRysLZ2zDSCNFxZjsyF0XFWRVdh Uv1yhbUZyGNuzVSxSUYeR2KbuzMuKPcnIQ+kSw2M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ido Schimmel , Jiri Pirko , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 33/51] mlxsw: core: Increase scope of RCU read-side critical section Date: Mon, 3 Aug 2020 14:20:18 +0200 Message-Id: <20200803121851.139904360@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200803121849.488233135@linuxfoundation.org> References: <20200803121849.488233135@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ido Schimmel [ Upstream commit 7d8e8f3433dc8d1dc87c1aabe73a154978fb4c4d ] The lifetime of the Rx listener item ('rxl_item') is managed using RCU, but is dereferenced outside of RCU read-side critical section, which can lead to a use-after-free. Fix this by increasing the scope of the RCU read-side critical section. Fixes: 93c1edb27f9e ("mlxsw: Introduce Mellanox switch driver core") Signed-off-by: Ido Schimmel Reviewed-by: Jiri Pirko Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlxsw/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index 96f9f267d16d4..a2161b1409047 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1574,11 +1574,13 @@ void mlxsw_core_skb_receive(struct mlxsw_core *mlxsw_core, struct sk_buff *skb, break; } } - rcu_read_unlock(); - if (!found) + if (!found) { + rcu_read_unlock(); goto drop; + } rxl->func(skb, local_port, rxl_item->priv); + rcu_read_unlock(); return; drop: