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=-5.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 55B98C43613 for ; Mon, 24 Jun 2019 10:22:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1912F20652 for ; Mon, 24 Jun 2019 10:22:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371756; bh=hiIZuYsTTiR3Joxulex90+VVmemtEuq0BwbeSceJ1Ho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wiGgRTndZcfmG2CmQM7HWR+aDPKpFEx3rzxO2TXNNkzlDIMgAgo06rvBILnW5FFd2 gkOrlBV5MAvOSI7NuuVnAlffo2G09W6VUHzrrZrJMqra4LyJdSeZKWDMCOEqvad3bv qEEnypxvy6JFCUAHr8EPa0wH5hj2acvvjUkA4gPw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731105AbfFXKWU (ORCPT ); Mon, 24 Jun 2019 06:22:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:58232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731101AbfFXKWU (ORCPT ); Mon, 24 Jun 2019 06:22:20 -0400 Received: from localhost (f4.8f.5177.ip4.static.sl-reverse.com [119.81.143.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 09C2F20645; Mon, 24 Jun 2019 10:22:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371739; bh=hiIZuYsTTiR3Joxulex90+VVmemtEuq0BwbeSceJ1Ho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yIv+zbXXlodOJQ1bfUvkvwXq8l3kz9XAivcZLslzJ9qyp/Ha5erqmyfJ9rHo2oNLB 2Ry5mBiwPQI82eNjsZGsapj5cnpNKlPNc4xN5x3VnSGUBaNJypChGOUEKXsjt9UuZs 5nbMSztwPn9TEREH1fTqVzJVYUrbDGau8RRXcyfk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg Subject: [PATCH 5.1 116/121] mac80211: drop robust management frames from unknown TA Date: Mon, 24 Jun 2019 17:57:28 +0800 Message-Id: <20190624092326.563304390@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624092320.652599624@linuxfoundation.org> References: <20190624092320.652599624@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johannes Berg commit 588f7d39b3592a36fb7702ae3b8bdd9be4621e2f upstream. When receiving a robust management frame, drop it if we don't have rx->sta since then we don't have a security association and thus couldn't possibly validate the frame. Cc: stable@vger.kernel.org Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/rx.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3823,6 +3823,8 @@ static bool ieee80211_accept_frame(struc case NL80211_IFTYPE_STATION: if (!bssid && !sdata->u.mgd.use_4addr) return false; + if (ieee80211_is_robust_mgmt_frame(skb) && !rx->sta) + return false; if (multicast) return true; return ether_addr_equal(sdata->vif.addr, hdr->addr1);