From patchwork Wed Jan 29 06:56:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3549561 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9E1149F382 for ; Wed, 29 Jan 2014 07:01:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC9F720176 for ; Wed, 29 Jan 2014 07:01:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ECA9820131 for ; Wed, 29 Jan 2014 07:01:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755836AbaA2HBf (ORCPT ); Wed, 29 Jan 2014 02:01:35 -0500 Received: from mail-ee0-f44.google.com ([74.125.83.44]:52954 "EHLO mail-ee0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755876AbaA2HBZ (ORCPT ); Wed, 29 Jan 2014 02:01:25 -0500 Received: by mail-ee0-f44.google.com with SMTP id c13so655556eek.17 for ; Tue, 28 Jan 2014 23:01:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+jqcd0YhAYEzH8VXbSgjEc3ks4GdijkZv/deEzueqng=; b=JRYYAeAQfBlZGmPuE48tXfZTQg+j4eHt6/qzlK6DuG9vmLX5pv1ElwXCjUcL6TvQLB mQnl3fc2+BWampYbnN0Bug9YaKbVZDFeISdCIMA7JEwFOkZ3R0mYtKzFqar/qYm4b073 zwKQBM1NhfC1iGmDBDUowWBvCvwgDnHYDCWt0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+jqcd0YhAYEzH8VXbSgjEc3ks4GdijkZv/deEzueqng=; b=QBft8HGZsjVS810jr/0hlGMRE1MlsBBGoXcVT0+bKsJnIWfrGYjkSUqZVxTiyhslRR Uo0rd8JUaYw/hKxV67SVWfJwBs3BhTEdo9U3H6cLJ+l3djrTRDQ15FkGqZEK/hkinrOk cvfFvSOZA+v0cSPnYF52l/EtUCzlnJSMqZyNn0htEXORFf0e1+I8CuzsJ2J6JHMxa4Wj qIsC3fymDcxWatxnbmHF+hC/HQf4htdTgIRwp4n5Uapb0dIieMorriAaeyO+XYRTfQ8B h89pT/P93YLVOiUBuKUcdM//E27MVCVw9fQd7WA35AiyZFNX0rxszH+IfaeeVOXqP7zz LUIQ== X-Gm-Message-State: ALoCoQmfCkRs6hbTsBLFZwBEa7wsNXg0ykelMcmA/f3NMJ2jBYKqnPvljPoGnKxrEtNwVMAcB1X3bH1tmoMEwQZvmyvv0qx4EGKHXQfM+ZE563n7Tpeg+98= X-Received: by 10.15.55.193 with SMTP id v41mr153845eew.80.1390978884063; Tue, 28 Jan 2014 23:01:24 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id v7sm4668066eel.2.2014.01.28.23.01.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jan 2014 23:01:23 -0800 (PST) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH 4/5] mac80211: fix sdata->radar_required locking Date: Wed, 29 Jan 2014 07:56:20 +0100 Message-Id: <1390978581-13273-5-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1390978581-13273-1-git-send-email-michal.kazior@tieto.com> References: <1390978581-13273-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP radar_required setting wasn't protected by local->mtx in some places. This should prevent from scanning/radar detection/roc colliding. Signed-off-by: Michal Kazior --- net/mac80211/cfg.c | 4 ++-- net/mac80211/chan.c | 2 ++ net/mac80211/ibss.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 20d4ee6..18e8687 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -970,9 +970,9 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, /* TODO: make hostapd tell us what it wants */ sdata->smps_mode = IEEE80211_SMPS_OFF; sdata->needed_rx_chains = sdata->local->rx_chains; - sdata->radar_required = params->radar_required; mutex_lock(&local->mtx); + sdata->radar_required = params->radar_required; err = ieee80211_vif_use_channel(sdata, ¶ms->chandef, IEEE80211_CHANCTX_SHARED); mutex_unlock(&local->mtx); @@ -3002,8 +3002,8 @@ static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) struct ieee80211_local *local = sdata->local; int err, changed = 0; - sdata->radar_required = sdata->csa_radar_required; mutex_lock(&local->mtx); + sdata->radar_required = sdata->csa_radar_required; err = ieee80211_vif_change_channel(sdata, &changed); mutex_unlock(&local->mtx); if (WARN_ON(err < 0)) diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index f43613a..42c6592 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -196,6 +196,8 @@ static bool ieee80211_is_radar_required(struct ieee80211_local *local) { struct ieee80211_sub_if_data *sdata; + lockdep_assert_held(&local->mtx); + rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) { if (sdata->radar_required) { diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 82d3d14..f01d468 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -303,6 +303,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, mutex_unlock(&local->mtx); return; } + sdata->radar_required = radar_required; mutex_unlock(&local->mtx); memcpy(ifibss->bssid, bssid, ETH_ALEN); @@ -318,7 +319,6 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, rcu_assign_pointer(ifibss->presp, presp); mgmt = (void *)presp->head; - sdata->radar_required = radar_required; sdata->vif.bss_conf.enable_beacon = true; sdata->vif.bss_conf.beacon_int = beacon_int; sdata->vif.bss_conf.basic_rates = basic_rates;