From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793208201; b=KPJAN+2h094Q8fDp7kXXQKF9Xyu6NIH2dn3Lc/8pOuLayW3satoArhXh6B2flQrruo0e n8H0vvS4DU04HcJwhnUKpW6yXVI6h2Y48jqGy4c/aVlnJmvmSUVTQsNYmMsSkX1oNOgcp UHbjgHFN68nfj3YW5qbZEuQUJvXHWdXslYvrLlXk5jGipFklhdKZg82GsNDT5ogjIun1L hDSOUkOX8l8JFke+AxJolJ8FDty0WROa3gxKk1cbjawJh7ypdpcy2tww4ePk2bTHPg+x0 6O3+O73tAla9Bd5A4cXNnucVIhBK/FWw26T99Bo2tPZq+cANR2rVBPavQ6vB3nW6NDA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793208201; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=QdlnpYcMwrGZK8O6sdxp3f149VXC5Kg8o2OMamPKs4A=; b=yi8ox816guhRGGco1426WGPdhLKRUKm0SEkEq2pxvatpatmR7JRpe3voWAE4Pv3JMuQ4 Wv8AZ/MWRVo+N8yw8tFGl4yo4E5nu3AMtX2QJN2oOhG8jK/DD2xHVxcr4bHfWqDt2M+UT Bi67f7p7zy+po2n0qcuGY2hy+413GZ3ONYoDvOnoYvyTofRTZ5b7xfTmPu6H7DZQ+NdxY jiO5Dkr5TSG4ktFPWl4Ut3HmShsKkxVfE+LiwauB3Zj2kw8GpOTbDu/BuqmxQMBxCCmB9 0Hq0fkMWI4BovMEkwJHIh4mngt1FdazCm0l10vJ6u8P+tgELW8P+XP/oxDvLKUinppA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=0d4jSTPy; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B44D3606A31E; Wed, 28 Oct 2026 17:23:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=0d4jSTPy Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F1751F01829; Wed, 28 Oct 2026 17:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793208200; bh=QdlnpYcMwrGZK8O6sdxp3f149VXC5Kg8o2OMamPKs4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0d4jSTPyXwdO3wBCv790gIwBGy5OUHBWEpV1zBjfNEW2Oa/G/wzsXappStA+32DL2 pPClyfZSwwVs/JA2gdEAJTBT0MUcoIFp9AR090a7GSEzgjVRIKvkdHwAr6jqk5P+0D zeC3KdRH/xoGgJEYs1OPI2p2XMpv84Zy/rccwUK4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daehyeon Ko <4ncienth@gmail.com>, Johannes Berg , Sasha Levin Subject: [PATCH 5.10 035/516] wifi: libipw: reject TKIP frames without a full MIC Date: Wed, 28 Oct 2026 17:53:07 +0100 Message-ID: <20261028170004.361661890@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028170003.522232767@linuxfoundation.org> References: <20261028170003.522232767@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daehyeon Ko <4ncienth@gmail.com> [ Upstream commit 06f42accaf3c6aecab1dcc57f68dde6c06c8b380 ] libipw_michael_mic_verify() assumes that an skb contains an eight-byte Michael MIC. A short TKIP frame makes the unsigned payload length wrap, causing michael_mic() to read past the skb. Check that the MIC is present before verifying it, and use the existing MICHAEL_MIC_LEN constant for all MIC lengths in the verifier. Fixes: b453872c35cf ("[NET] ieee80211 subsystem") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Daehyeon Ko <4ncienth@gmail.com> Link: https://patch.msgid.link/20260909061124.3802517-1-4ncienth@gmail.com Signed-off-by: Johannes Berg [ adapted libipw changes to the older lib80211 implementation and Michael MIC helper interface. ] Signed-off-by: Sasha Levin --- net/wireless/lib80211_crypt_tkip.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/net/wireless/lib80211_crypt_tkip.c b/net/wireless/lib80211_crypt_tkip.c index 1b4d6c87a5c5d..823274728711a 100644 --- a/net/wireless/lib80211_crypt_tkip.c +++ b/net/wireless/lib80211_crypt_tkip.c @@ -38,6 +38,7 @@ MODULE_DESCRIPTION("lib80211 crypt: TKIP"); MODULE_LICENSE("GPL"); #define TKIP_HDR_LEN 8 +#define MICHAEL_MIC_LEN 8 struct lib80211_tkip_data { #define TKIP_KEY_LEN 32 @@ -585,16 +586,18 @@ static int lib80211_michael_mic_verify(struct sk_buff *skb, int keyidx, int hdr_len, void *priv) { struct lib80211_tkip_data *tkey = priv; - u8 mic[8]; + u8 mic[MICHAEL_MIC_LEN]; - if (!tkey->key_set) + if (!tkey->key_set || skb->len < hdr_len + MICHAEL_MIC_LEN) return -1; michael_mic_hdr(skb, tkey->rx_hdr); if (michael_mic(tkey->rx_tfm_michael, &tkey->key[24], tkey->rx_hdr, - skb->data + hdr_len, skb->len - 8 - hdr_len, mic)) + skb->data + hdr_len, + skb->len - MICHAEL_MIC_LEN - hdr_len, mic)) return -1; - if (memcmp(mic, skb->data + skb->len - 8, 8) != 0) { + if (memcmp(mic, skb->data + skb->len - MICHAEL_MIC_LEN, + MICHAEL_MIC_LEN) != 0) { struct ieee80211_hdr *hdr; hdr = (struct ieee80211_hdr *)skb->data; printk(KERN_DEBUG "%s: Michael MIC verification failed for " @@ -612,7 +615,7 @@ static int lib80211_michael_mic_verify(struct sk_buff *skb, int keyidx, tkey->rx_iv32 = tkey->rx_iv32_new; tkey->rx_iv16 = tkey->rx_iv16_new; - skb_trim(skb, skb->len - 8); + skb_trim(skb, skb->len - MICHAEL_MIC_LEN); return 0; } -- 2.53.0