From patchwork Mon Jan 20 14:21:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3513031 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9CCA3C02DC for ; Mon, 20 Jan 2014 14:25:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97D352017A for ; Mon, 20 Jan 2014 14:25:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D56F20173 for ; Mon, 20 Jan 2014 14:25:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753733AbaATOZw (ORCPT ); Mon, 20 Jan 2014 09:25:52 -0500 Received: from mail-ea0-f173.google.com ([209.85.215.173]:33223 "EHLO mail-ea0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753349AbaATOZo (ORCPT ); Mon, 20 Jan 2014 09:25:44 -0500 Received: by mail-ea0-f173.google.com with SMTP id d10so350245eaj.18 for ; Mon, 20 Jan 2014 06:25:41 -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=/FtctNR2g9dez5Yv2WRlcd5H3/WjYquwcwYrTClUkaU=; b=ewyT5XA3GkUTfkxuT2e6Wjv9Mxt7U21TVH+YQ1hUq13wCm/8TFuM31jDSE5uETR0do GwBehh4iG1CFz7+UcNNbXYGEnGp3gffcnAb6qswXHcVCMRZ3wiIn/MtVVkRqHZ4CDTzn 2EOT5OpB/txNGcbytS0ZCBRxAQHN44oE6grbU= 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=/FtctNR2g9dez5Yv2WRlcd5H3/WjYquwcwYrTClUkaU=; b=Z54GX31RgaWq6dESfun9tFwwYvxWpkoB/rTqSmriwakGXCYf63NKMHoR6xsdkbu0qT Oj3FaUv8PS+RdMxbNg4AaW38iZ9z9T91QLAmw8VrpbYvdTHl8HwKmMKmIh637n6Jnjvx gdhUgSSbXrb3yAluZPfROUti7Ek8NELrQ0rsQzylMoVnl2hVEqR7t3ICq6VQf62L/6sY mzJwFNY0L/WLRKm0r/RfAscKXNaFg3kKiBLoFubmX8Kkv4Cx5BwjH2mrgscXT/5Crvth XXatRknJ6IqaqEOdzjVG5haFMo7jtXFyR/OVv3caU+dqBSeppfsZzHarq4WtOuz9lz3m LVZw== X-Gm-Message-State: ALoCoQltZzfzSzgOXiWjMMIlHDAtoavtctD0wTu3et820VRkZrkfCscH4GZOwvAtdBmbOds1BT5fbN3sIFFJADC6Sq017n8s3VTdAbPrNCiN1xJerXSEm1E= X-Received: by 10.14.115.133 with SMTP id e5mr2111213eeh.91.1390227941776; Mon, 20 Jan 2014 06:25:41 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id 46sm3702597ees.4.2014.01.20.06.25.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jan 2014 06:25:41 -0800 (PST) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH 4/7] mac80211: fix sdata->radar_required locking Date: Mon, 20 Jan 2014 15:21:07 +0100 Message-Id: <1390227670-19030-5-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1390227670-19030-1-git-send-email-michal.kazior@tieto.com> References: <1390227670-19030-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/ibss.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 76fe1f90..ddb1c4d 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); @@ -3017,8 +3017,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/ibss.c b/net/mac80211/ibss.c index 5ca5834..4854800 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;