From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A14395250 for ; Fri, 4 Aug 2023 10:42:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82D32C433C8; Fri, 4 Aug 2023 10:42:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1691145723; bh=59hgmRJD8zAuTk3rh1tJHpF7TPUjRvw1kVL7rArnwGQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ib/jpO1V7eA3W0EcATFyIw5XWVOQES+fu5HayAcWEThHr4QaMwvffcSMQWS9Xknl0 kRMIRlN/gV4bS1CR9W6ZGVYksBb0tffEcSpQ6Mef0oDHQQ9z/W645gG9802NA2wqax Vke1W5cmN410suItALn8vbFgiBqW6QTsnauQhsgc= Date: Fri, 4 Aug 2023 12:42:00 +0200 From: Greg Kroah-Hartman To: Ashwin Dayanand Kamat Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Wen Gong , Jouni Malinen , Johannes Berg , davem@davemloft.net, ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, akaher@vmware.com, vsirnapalli@vmware.com, tkundu@vmware.com, namit@vmware.com Subject: Re: [PATCH v4.19.y] ath10k: Fix TKIP Michael MIC verification for PCIe Message-ID: <2023080431-cobweb-fidgeting-e4de@gregkh> References: <1690971733-22270-1-git-send-email-kashwindayan@vmware.com> <2023080408-squad-pony-2638@gregkh> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <2023080408-squad-pony-2638@gregkh> On Fri, Aug 04, 2023 at 12:28:18PM +0200, Greg Kroah-Hartman wrote: > On Wed, Aug 02, 2023 at 03:52:13PM +0530, Ashwin Dayanand Kamat wrote: > > From: Wen Gong > > > > commit 0dc267b13f3a7e8424a898815dd357211b737330 upstream. > > > > TKIP Michael MIC was not verified properly for PCIe cases since the > > validation steps in ieee80211_rx_h_michael_mic_verify() in mac80211 did > > not get fully executed due to unexpected flag values in > > ieee80211_rx_status. > > > > Fix this by setting the flags property to meet mac80211 expectations for > > performing Michael MIC validation there. This fixes CVE-2020-26141. It > > does the same as ath10k_htt_rx_proc_rx_ind_hl() for SDIO which passed > > MIC verification case. This applies only to QCA6174/QCA9377 PCIe. > > > > Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1 > > > > Cc: stable@vger.kernel.org > > Signed-off-by: Wen Gong > > Signed-off-by: Jouni Malinen > > Link: https://lore.kernel.org/r/20210511200110.c3f1d42c6746.I795593fcaae941c471425b8c7d5f7bb185d29142@changeid > > Signed-off-by: Johannes Berg > > Signed-off-by: Ashwin Dayanand Kamat > > --- > > drivers/net/wireless/ath/ath10k/htt_rx.c | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > > > Now queued up, thanks. Nope, breaks the build, how did you test this: CC [M] drivers/net/wireless/ath/ath10k/htt_rx.o drivers/net/wireless/ath/ath10k/htt_rx.c: In function ‘ath10k_htt_rx_h_mpdu’: drivers/net/wireless/ath/ath10k/htt_rx.c:1649:21: error: ‘frag’ undeclared (first use in this function) 1649 | if (frag && !fill_crypt_header && | ^~~~ > > greg k-h