From patchwork Mon Nov 25 19:56:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz.Dziedzic@tieto.com X-Patchwork-Id: 3234171 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 F183E9F3A0 for ; Mon, 25 Nov 2013 19:56:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B3D1200D5 for ; Mon, 25 Nov 2013 19:56:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C478202DD for ; Mon, 25 Nov 2013 19:56:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757350Ab3KYT4Z (ORCPT ); Mon, 25 Nov 2013 14:56:25 -0500 Received: from mail-ea0-f177.google.com ([209.85.215.177]:52233 "EHLO mail-ea0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755382Ab3KYT4X (ORCPT ); Mon, 25 Nov 2013 14:56:23 -0500 Received: by mail-ea0-f177.google.com with SMTP id n15so2796584ead.36 for ; Mon, 25 Nov 2013 11:56:23 -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=hKXeWjOmianIXCtyiahibxSlCaoPSaAzCQSYVpx47W0=; b=nw9+/CssUW9JLjWu2hX5u3G6vU9X7U5d0lzJSajygz5hyNw3epiwCV+v1gJQ19u5nx 2MfI2Bb25CcSBuhvHT9bcYHqnDJ1XeY3zFN5Z4ZEkgO6j9F8j5ZrAVE2jYn/8WsCilzK BIVcPBYRkDNkfReeAQQIPuV13JvMlaoJ85Umk= 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=hKXeWjOmianIXCtyiahibxSlCaoPSaAzCQSYVpx47W0=; b=gEJEAjW4Hby76fRhXnFTRQGLEukWcDvzBb6tYOT/2YDGYwE2IOMB/TA0WBYw+aMJ+J r03jw7GU7hf68z11IoN7vqaAGdDhwFyH7r216G/k6L5W6ks2o2o406DiLUmc1ewZ2Yko Tt2egtb2FPmE9x5G9TxmzG56OAgmF6LusiC8r4MlujcbVJZiASls3UIWywJy7DWjhjwb Gf96CmVYhMNih5kLtOES/LJZXkvbfXj94VTf7fFPhNinDva+WW8GFUD6oBzMkdMI53BU F37ynmsdHwf8fwUPj5FM/jM2r73qKCBVvROd6SVA3+B5VoYky/fpXbOCvK25Cnfu0eoq uKdw== X-Gm-Message-State: ALoCoQkR/n+49kmOf7bMbJB+QLgwz/MK72/xSgWCebsEqSUgFaKQALvZgfadrKwotKgRS4JuML5jZAIG8tnIJ17YKcwbbtn3tn/payeUvUZm0Y0i/ujrMyM= X-Received: by 10.14.5.12 with SMTP id 12mr38309983eek.9.1385409382857; Mon, 25 Nov 2013 11:56:22 -0800 (PST) Received: from localhost.localdomain (host-62-141-204-146.swidnica.mm.pl. [62.141.204.146]) by mx.google.com with ESMTPSA id h48sm2043110eev.3.2013.11.25.11.56.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Nov 2013 11:56:22 -0800 (PST) From: Janusz Dziedzic To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, "Luis R. Rodriguez" , Janusz Dziedzic Subject: [PATCH v3 2/4] cfg80211: DFS check dfs_region before usage Date: Mon, 25 Nov 2013 20:56:10 +0100 Message-Id: <1385409372-4229-2-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1385409372-4229-1-git-send-email-janusz.dziedzic@tieto.com> References: <1385409372-4229-1-git-send-email-janusz.dziedzic@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=-6.8 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 From: "Luis R. Rodriguez" Check the DFS region before channel availability check. Signed-off-by: Luis R. Rodriguez Signed-off-by: Janusz Dziedzic --- net/wireless/nl80211.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 70290f8..81579ae 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5650,8 +5650,13 @@ static int nl80211_start_radar_detection(struct sk_buff *skb, struct net_device *dev = info->user_ptr[1]; struct wireless_dev *wdev = dev->ieee80211_ptr; struct cfg80211_chan_def chandef; + enum nl80211_dfs_regions dfs_region; int err; + dfs_region = reg_get_dfs_region(wdev->wiphy); + if (dfs_region == NL80211_DFS_UNSET) + return -EINVAL; + err = nl80211_parse_chandef(rdev, info, &chandef); if (err) return err;