From patchwork Mon Jan 15 07:12:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominik Brodowski X-Patchwork-Id: 10163189 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1162260325 for ; Mon, 15 Jan 2018 07:13:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F368B2834A for ; Mon, 15 Jan 2018 07:13:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E84E6285FB; Mon, 15 Jan 2018 07:13:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 819252834A for ; Mon, 15 Jan 2018 07:13:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754270AbeAOHMm (ORCPT ); Mon, 15 Jan 2018 02:12:42 -0500 Received: from isilmar-4.linta.de ([136.243.71.142]:58432 "EHLO isilmar-4.linta.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753926AbeAOHMl (ORCPT ); Mon, 15 Jan 2018 02:12:41 -0500 Received: from light.dominikbrodowski.net (isilmar.linta [10.0.0.1]) by isilmar-4.linta.de (Postfix) with ESMTPS id 3B255200907; Mon, 15 Jan 2018 07:12:39 +0000 (UTC) Received: by light.dominikbrodowski.net (Postfix, from userid 1000) id 831A420D18; Mon, 15 Jan 2018 08:12:15 +0100 (CET) Date: Mon, 15 Jan 2018 08:12:15 +0100 From: Dominik Brodowski To: Johannes Berg Cc: regressions@leemhuis.info, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] nl80211: take RCU read lock when calling ieee80211_bss_get_ie() Message-ID: <20180115071215.GA2639@light.dominikbrodowski.net> References: <20171222072012.GA3110@light.dominikbrodowski.net> <20171230131132.GA2624@light.dominikbrodowski.net> <20180108100403.GA4715@light.dominikbrodowski.net> <20180114180338.GA1569@light.dominikbrodowski.net> <1515967102.26804.31.camel@sipsolutions.net> <20180114222255.GA9036@light.dominikbrodowski.net> <1515969647.26804.33.camel@sipsolutions.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1515969647.26804.33.camel@sipsolutions.net> User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As ieee80211_bss_get_ie() derefences an RCU to return ssid_ie, both the call to this function and any operation on this variable need protection by the RCU read lock. Fixes: 44905265bc15 ("nl80211: don't expose wdev->ssid for most interfaces") Signed-off-by: Dominik Brodowski --- > but after, perhaps it's easier to just do > > if (ssid_ie && > nla_put(...) > goto nla_put_failure_rcu_locked; > > and avoid the extra label (but yeah, it's getting late) OK, done that (and updated the commit message), and testet it. Thanks, Dominik diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 2b3dbcd40e46..ed87a97fcb0b 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2618,12 +2618,13 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flag const u8 *ssid_ie; if (!wdev->current_bss) break; + rcu_read_lock(); ssid_ie = ieee80211_bss_get_ie(&wdev->current_bss->pub, WLAN_EID_SSID); - if (!ssid_ie) - break; - if (nla_put(msg, NL80211_ATTR_SSID, ssid_ie[1], ssid_ie + 2)) - goto nla_put_failure_locked; + if (ssid_ie && + nla_put(msg, NL80211_ATTR_SSID, ssid_ie[1], ssid_ie + 2)) + goto nla_put_failure_rcu_locked; + rcu_read_unlock(); break; } default: @@ -2635,6 +2636,8 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flag genlmsg_end(msg, hdr); return 0; + nla_put_failure_rcu_locked: + rcu_read_unlock(); nla_put_failure_locked: wdev_unlock(wdev); nla_put_failure: