From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2CEBC4332B for ; Wed, 18 Mar 2020 20:54:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1C21208DB for ; Wed, 18 Mar 2020 20:54:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564891; bh=wHVMFXCOPG4nZvILfcIh/HvdK/unXPCQb97HaqKUvT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OEEs+mNpTI6GI29YiYStUrYL+BCENI5/8noYAIjUs3295hRsxE/q7cgyda/Ve/LJ2 EYZ4B5ANkP6VSfH/ldPKSX8n54XRCgKGBqQQxJ+HGlQ9mAjZyGwW5/C2KU2qtGeuMK yXtm/tbBJDAC1jzW1Vce32M0E7PGazJOpT9l7ocI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727151AbgCRUyu (ORCPT ); Wed, 18 Mar 2020 16:54:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:54716 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728000AbgCRUyt (ORCPT ); Wed, 18 Mar 2020 16:54:49 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C3D1120B1F; Wed, 18 Mar 2020 20:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564888; bh=wHVMFXCOPG4nZvILfcIh/HvdK/unXPCQb97HaqKUvT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sCWEJ6nB8KFwsBsqkNBSMP0vHZLMbtdwS55IfICXwFy2PY8XX/8cNADnFOW9J7YEG ID3sr/JcsbI056LlNAs0iQuXA5vpNBhn2aKvR6w4TGMMbDgfQAj6fQzUkWR8rWE3uj 4erWPodOS1QL6wrLhRCrPxwGhWssuzjgvwk0JApk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jakub Kicinski , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 57/73] nl80211: add missing attribute validation for beacon report scanning Date: Wed, 18 Mar 2020 16:53:21 -0400 Message-Id: <20200318205337.16279-57-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200318205337.16279-1-sashal@kernel.org> References: <20200318205337.16279-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jakub Kicinski [ Upstream commit 056e9375e1f3c4bf2fd49b70258c7daf788ecd9d ] Add missing attribute validation for beacon report scanning to the netlink policy. Fixes: 1d76250bd34a ("nl80211: support beacon report scanning") Signed-off-by: Jakub Kicinski Link: https://lore.kernel.org/r/20200303051058.4089398-3-kuba@kernel.org Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 9ca16ca0528ac..f0c6c522964c2 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -469,6 +469,8 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { [NL80211_ATTR_WOWLAN_TRIGGERS] = { .type = NLA_NESTED }, [NL80211_ATTR_STA_PLINK_STATE] = NLA_POLICY_MAX(NLA_U8, NUM_NL80211_PLINK_STATES - 1), + [NL80211_ATTR_MEASUREMENT_DURATION] = { .type = NLA_U16 }, + [NL80211_ATTR_MEASUREMENT_DURATION_MANDATORY] = { .type = NLA_FLAG }, [NL80211_ATTR_MESH_PEER_AID] = NLA_POLICY_RANGE(NLA_U16, 1, IEEE80211_MAX_AID), [NL80211_ATTR_SCHED_SCAN_INTERVAL] = { .type = NLA_U32 }, -- 2.20.1