Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp849382pja; Wed, 1 Apr 2020 09:48:34 -0700 (PDT) X-Google-Smtp-Source: APiQypIE+BaRSrn+3vdnSW4tYdSpJ0ozwfcqYN8y6tZMqO6hWiAjolWO2wBXgI6aFJuMSV9nR102 X-Received: by 2002:aca:fc0f:: with SMTP id a15mr3546952oii.68.1585759714759; Wed, 01 Apr 2020 09:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759714; cv=none; d=google.com; s=arc-20160816; b=RuBzddoH2NFbn9g5KvOFCcN1RDyK4ipTy6Ti97nVWY8S1FdrqX6cF5iRUWPO+ORNpN YzwPxM0olh6Nlqj6zXTStvFfc5p8lhmKCSIB1OGspfKPLtpbRLNiREmUiZ8/HZ+hQXFy yrecbi5BN0dXjuiQXT3LVXzr0QPDSQekftD8OLJeW+8Mdrd7wZOAFNv8Xtw84DX0nOq2 JOO3TQ4TKviibCL0q/m0F0mGj2c9143Z4G6ks7tXOAcCPbPHFINI49bJHw7rVxafk4Wk FzNDbtEkeFuERu/Cvv0UKmkqFAHK/1V4F/v7UlBy2Job6fk7AQKU5432Uj34bgp2R9N2 NEIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BrSriVaHoIOFO7glcI5L8A/Lvj6fF8Uu/ALgxORDSWc=; b=CrddfxZ+xgHH3Nky/fJD1fLPuubr3BUlbrFNh6ouUID1ed3OKZ7iL1FqD3yKWdvHsH zc1QdXwlhK8QVfiE+DwHEirsCFBKNz6QyctdeRZW8dy78Zk/tyOHP9mTxkBmQ9P+fAmU ArQ4E7ER6NUSLCLPamHs7RwbRp8YzTt02BRVviTKlchxEk5h3cdXuW+Wju5yOhAxRRFl lUEo2ZQiwmXq8/WVOyfd7P3ZwGYqTm6aE4am+s27KTt6AmHNGS02q8v2ndcAZclgNu1K byZBSi3me5xINCBUYJdjJ32B9huGtWqZ7eJzF76s+81YZceCNldP40XjtcRl0wqXJf95 4sEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Mt+neDx+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z90si1030376otb.47.2020.04.01.09.48.21; Wed, 01 Apr 2020 09:48:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Mt+neDx+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389969AbgDAQqm (ORCPT + 99 others); Wed, 1 Apr 2020 12:46:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:48062 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389966AbgDAQqi (ORCPT ); Wed, 1 Apr 2020 12:46:38 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 6C23320705; Wed, 1 Apr 2020 16:46:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759597; bh=6QCiJe92C6d7clPEjD79k8RBuhcqQjqzeW6E0U7WrJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mt+neDx+44BNos/yzhrjsi76b1RSlmb10yVKtT5GTg9WV1J+O+zosF52BuaTldEuZ jKVY+caJOzXJrb2qUppOKMoACKW4RxJvp8L/Q0C2cdYiT5Ga/igTK/7IYlu9kczM8z qQ1ozysE69h2v3WbbV+lewiNso/0sjhsxpDgoRng= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg , "David S. Miller" , Woody Suwalski Subject: [PATCH 4.14 131/148] mac80211: fix authentication with iwlwifi/mvm Date: Wed, 1 Apr 2020 18:18:43 +0200 Message-Id: <20200401161604.952154480@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg commit be8c827f50a0bcd56361b31ada11dc0a3c2fd240 upstream. The original patch didn't copy the ieee80211_is_data() condition because on most drivers the management frames don't go through this path. However, they do on iwlwifi/mvm, so we do need to keep the condition here. Cc: stable@vger.kernel.org Fixes: ce2e1ca70307 ("mac80211: Check port authorization in the ieee80211_tx_dequeue() case") Signed-off-by: Johannes Berg Signed-off-by: David S. Miller Cc: Woody Suwalski Signed-off-by: Greg Kroah-Hartman --- net/mac80211/tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3457,7 +3457,8 @@ begin: * Drop unicast frames to unauthorised stations unless they are * EAPOL frames from the local station. */ - if (unlikely(!ieee80211_vif_is_mesh(&tx.sdata->vif) && + if (unlikely(ieee80211_is_data(hdr->frame_control) && + !ieee80211_vif_is_mesh(&tx.sdata->vif) && tx.sdata->vif.type != NL80211_IFTYPE_OCB && !is_multicast_ether_addr(hdr->addr1) && !test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&