From patchwork Mon Jun 1 13:54:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wojciech Dubowik X-Patchwork-Id: 6522291 X-Patchwork-Delegate: johannes@sipsolutions.net 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4DE969F1C1 for ; Mon, 1 Jun 2015 14:00:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74E94205E4 for ; Mon, 1 Jun 2015 14:00:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBB78205EE for ; Mon, 1 Jun 2015 14:00:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752846AbbFAOAA (ORCPT ); Mon, 1 Jun 2015 10:00:00 -0400 Received: from mail.neratec.com ([46.140.151.2]:64668 "EHLO mail.neratec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752807AbbFAN7w (ORCPT ); Mon, 1 Jun 2015 09:59:52 -0400 X-Greylist: delayed 326 seconds by postgrey-1.27 at vger.kernel.org; Mon, 01 Jun 2015 09:59:52 EDT Received: from localhost (localhost [127.0.0.1]) by mail.neratec.com (Postfix) with ESMTP id 6C9B5A05F98 for ; Mon, 1 Jun 2015 15:54:24 +0200 (CEST) Received: from mail.neratec.com ([127.0.0.1]) by localhost (mail.neratec.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id KngRI2zZyqF2; Mon, 1 Jun 2015 15:54:23 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.neratec.com (Postfix) with ESMTP id D6F88A05F97; Mon, 1 Jun 2015 15:54:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at neratec.com Received: from mail.neratec.com ([127.0.0.1]) by localhost (mail.neratec.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id F9wYx5JTRSai; Mon, 1 Jun 2015 15:54:23 +0200 (CEST) Received: from CHB500181.neratec.local (CHB500181.neratec.local [192.168.11.68]) by mail.neratec.com (Postfix) with ESMTPSA id BBCB4A05F94; Mon, 1 Jun 2015 15:54:23 +0200 (CEST) From: Wojciech Dubowik To: linux-wireless@vger.kernel.org Cc: Wojciech Dubowik Subject: [PATCH] mac80211: Fix double locking on CSA counter update Date: Mon, 1 Jun 2015 15:54:16 +0200 Message-Id: <1433166856-3285-1-git-send-email-Wojciech.Dubowik@neratec.com> X-Mailer: git-send-email 1.9.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 We call rcu locked ieee80211_csa_update_counter from already locked section. Fix it by decrementing counter directly instead of calling ieee80211_csa_update_counter. Signed-off-by: Wojciech Dubowik --- net/mac80211/tx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 8df1342..9233559 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3338,7 +3338,7 @@ __ieee80211_beacon_get(struct ieee80211_hw *hw, if (beacon) { if (beacon->csa_counter_offsets[0]) { if (!is_template) - ieee80211_csa_update_counter(vif); + WARN_ON_ONCE(beacon->csa_current_counter--); ieee80211_set_csa(sdata, beacon); } @@ -3384,7 +3384,7 @@ __ieee80211_beacon_get(struct ieee80211_hw *hw, if (beacon->csa_counter_offsets[0]) { if (!is_template) - ieee80211_csa_update_counter(vif); + WARN_ON_ONCE(beacon->csa_current_counter--); ieee80211_set_csa(sdata, beacon); } @@ -3414,7 +3414,7 @@ __ieee80211_beacon_get(struct ieee80211_hw *hw, * for now we leave it consistent with overall * mac80211's behavior. */ - ieee80211_csa_update_counter(vif); + WARN_ON_ONCE(beacon->csa_current_counter--); ieee80211_set_csa(sdata, beacon); }