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=-6.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 44255C3A5AD for ; Wed, 4 Sep 2019 18:20:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 16B9622DBF for ; Wed, 4 Sep 2019 18:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567621216; bh=v7RqTjc0cQjE26WkD6A1sDJZ16ukhMrvFgBbBG/0VHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qMojFdZhUgljA7A2TnrgO54pxSZM+LsQ8Zn9+WdDxlAaokF1zPHskF9iv40+Nd4zH OmMrxae6rDm9hIKyJ4b+iBlIPLHwAHYMll3POpvDio3n7K+KM2zQJtIPJKBn8YphTi wdvpdh6dW8e5zU3WIb9ugb44lRAgsnK/pEJ6u+EQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389316AbfIDSId (ORCPT ); Wed, 4 Sep 2019 14:08:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:51416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389416AbfIDSIa (ORCPT ); Wed, 4 Sep 2019 14:08:30 -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 8A47920870; Wed, 4 Sep 2019 18:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567620510; bh=v7RqTjc0cQjE26WkD6A1sDJZ16ukhMrvFgBbBG/0VHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oz22GHq9cfxOqBl3cTMiDuZVS4AOX6WLuIKgiSuj6LEfhsCstjg7A7rjnmJGo4pLg pUiVdGtA+ciKq5BnegRz4NFHeUL2g1H/OmZ/nqbuRGUQODKZqAf29FmF7PU+CHmXmB 76dS+O5m8iy8DQPjIqm1NVri5n/rwvxVHUHi6TJI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Denis Kenzior , Johannes Berg Subject: [PATCH 4.19 83/93] mac80211: Correctly set noencrypt for PAE frames Date: Wed, 4 Sep 2019 19:54:25 +0200 Message-Id: <20190904175310.288286492@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190904175302.845828956@linuxfoundation.org> References: <20190904175302.845828956@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: Denis Kenzior commit f8b43c5cf4b62a19f2210a0f5367b84e1eff1ab9 upstream. The noencrypt flag was intended to be set if the "frame was received unencrypted" according to include/uapi/linux/nl80211.h. However, the current behavior is opposite of this. Cc: stable@vger.kernel.org Fixes: 018f6fbf540d ("mac80211: Send control port frames over nl80211") Signed-off-by: Denis Kenzior Link: https://lore.kernel.org/r/20190827224120.14545-3-denkenz@gmail.com Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2372,7 +2372,7 @@ static void ieee80211_deliver_skb_to_loc skb->protocol == cpu_to_be16(ETH_P_PREAUTH)) && sdata->control_port_over_nl80211)) { struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); - bool noencrypt = status->flag & RX_FLAG_DECRYPTED; + bool noencrypt = !(status->flag & RX_FLAG_DECRYPTED); cfg80211_rx_control_port(dev, skb, noencrypt); dev_kfree_skb(skb);