From patchwork Thu Dec 19 20:53:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 3384391 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 28F3CC0D4A for ; Thu, 19 Dec 2013 20:53:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50DE8206AD for ; Thu, 19 Dec 2013 20:53:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7609A206B2 for ; Thu, 19 Dec 2013 20:53:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756521Ab3LSUxb (ORCPT ); Thu, 19 Dec 2013 15:53:31 -0500 Received: from mail-pb0-f47.google.com ([209.85.160.47]:55719 "EHLO mail-pb0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756515Ab3LSUxa (ORCPT ); Thu, 19 Dec 2013 15:53:30 -0500 Received: by mail-pb0-f47.google.com with SMTP id um1so1651227pbc.34 for ; Thu, 19 Dec 2013 12:53:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=jafQFEM/h5nztxvU5QMbJ9146ibxmHnG6TlTYNT9ELA=; b=vGXcWFhxCLe6y8DyHzjrt/kD55i5ubswecbsa2IyC1Ha8rL54vLYhazCqmsFiVs9Cw jj3g81052SQMWoblDrj+//u1BknNvBZceL0Ak8DE2KWFh+09ok/sXGPNTh1HLyZYnlUv NS4H7oz4L+HT5xAy/oAhUyRWKoGh7RfTbDA8SEgUC1Ld96qMRnRqXJEw/CTh1MqTLf/F sjz9Ow8UqSK9fRKAJAe1esdT+y9At9lQfXKFeam/ZuWzs6Bwkaa69ujRJFVzii8ZNLe5 y2/7VbwtJP9IWvP2xv0agO9U0iCEiR72mWz1lw+/1CyPHvDUKkPrSKl5ZxUzPAdIFDmg WJ8g== X-Received: by 10.68.134.98 with SMTP id pj2mr4112705pbb.110.1387486409823; Thu, 19 Dec 2013 12:53:29 -0800 (PST) Received: from mcgrof@gmail.com (c-98-234-148-242.hsd1.ca.comcast.net. [98.234.148.242]) by mx.google.com with ESMTPSA id uf2sm9401908pbc.28.2013.12.19.12.53.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 19 Dec 2013 12:53:28 -0800 (PST) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Thu, 19 Dec 2013 12:53:25 -0800 From: "Luis R. Rodriguez" To: johannes@sipsolutions.net Cc: linux@eikelenboom.it, linux-wireless@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH 1/3] cfg80211: allow reprocessing of pending requests Date: Thu, 19 Dec 2013 12:53:17 -0800 Message-Id: <1387486399-4053-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1387486399-4053-1-git-send-email-mcgrof@do-not-panic.com> References: <1387486399-4053-1-git-send-email-mcgrof@do-not-panic.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 This addresses the RCU component of allowing us to reprocess the last regulatory request. Reported-by: Sander Eikelenboom Signed-off-by: Luis R. Rodriguez --- net/wireless/reg.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 9b897fc..5be2d7c 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -244,19 +244,21 @@ static char user_alpha2[2]; module_param(ieee80211_regdom, charp, 0444); MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain code"); -static void reg_kfree_last_request(void) +static void reg_kfree_last_request(struct regulatory_request *lr) { - struct regulatory_request *lr; - - lr = get_last_request(); - if (lr != &core_request_world && lr) kfree_rcu(lr, rcu_head); } static void reg_update_last_request(struct regulatory_request *request) { - reg_kfree_last_request(); + struct regulatory_request *lr; + + lr = get_last_request(); + if (lr == request) + return; + + reg_kfree_last_request(lr); rcu_assign_pointer(last_request, request); }