From patchwork Thu Mar 19 13:00:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 228973 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 27004C4332E for ; Thu, 19 Mar 2020 13:33:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3C4420787 for ; Thu, 19 Mar 2020 13:33:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584624797; bh=CEZE2M2M19p/tI/qitCnZMFSK+sh5USz35jRAEJmX4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Y3eV5mA3PFcjRBd+KJSUSWs+KazyI5Dc+e5AcgGWtRWNA+K6b3TwuqKUG2dzMJc24 dnzDT0UoUkKQbCOdlowMikbScitS/ytm3DEoQOt/h1yG6oSDlTy18XsyGtGEwTnVct UWteXPVRuNRSbbSN3IFFIn1bzC0CDPoPRglhbx9c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728453AbgCSNOK (ORCPT ); Thu, 19 Mar 2020 09:14:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:33458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728548AbgCSNOK (ORCPT ); Thu, 19 Mar 2020 09:14:10 -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 1CA2320722; Thu, 19 Mar 2020 13:14:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623649; bh=CEZE2M2M19p/tI/qitCnZMFSK+sh5USz35jRAEJmX4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MsCSb5ZgnUmOu8sr0ef9+8w2EDUvDIFCwmgB74WKEaSc2iHQXawfek4yfLfp+IIDD okuaK684yex2asQB73A4WcYhbzD13LLA17m70fDp4qVUiueJhzeBERBH/zpfKEQzVR T0hMlZuNV4kFlh34Q77iFP8YUQxlmVDe5GK70QK8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Madhuparna Bhowmik , Johannes Berg , Sasha Levin Subject: [PATCH 4.9 84/90] mac80211: rx: avoid RCU list traversal under mutex Date: Thu, 19 Mar 2020 14:00:46 +0100 Message-Id: <20200319123954.292943173@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123928.635114118@linuxfoundation.org> References: <20200319123928.635114118@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: Madhuparna Bhowmik [ Upstream commit 253216ffb2a002a682c6f68bd3adff5b98b71de8 ] local->sta_mtx is held in __ieee80211_check_fast_rx_iface(). No need to use list_for_each_entry_rcu() as it also requires a cond argument to avoid false lockdep warnings when not used in RCU read-side section (with CONFIG_PROVE_RCU_LIST). Therefore use list_for_each_entry(); Signed-off-by: Madhuparna Bhowmik Link: https://lore.kernel.org/r/20200223143302.15390-1-madhuparnabhowmik10@gmail.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 74652eb2f90fd..a6f265262f151 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3841,7 +3841,7 @@ void __ieee80211_check_fast_rx_iface(struct ieee80211_sub_if_data *sdata) lockdep_assert_held(&local->sta_mtx); - list_for_each_entry_rcu(sta, &local->sta_list, list) { + list_for_each_entry(sta, &local->sta_list, list) { if (sdata != sta->sdata && (!sta->sdata->bss || sta->sdata->bss != sdata->bss)) continue;