From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 887164D7D50; Wed, 30 Sep 2026 15:39:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790782763; cv=none; b=gx3/zUm5Dt3v87A68C7DZnP4vUW4lXyHl1Zntx5WTtbxSvmymeQxPrnL61MPWc2Vo9bB6tcVf7I7x4JKGKfjhwXPyDyerJv4mzimLGbqz4rtQsjT9XmuyaJcZOLUmO98k6vANH0f7EP+VfW/9pOJG8PiSOUIRNAct/kufNSC1Ow= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790782763; c=relaxed/simple; bh=LsHDNUDepHbGVxZGAg+1fgQPHolUPCyk9FwJgBC62Bo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bNa/S6mq/+AtBRNA5q/1OkwxM2K7i+hNKzyRq0dHCEkSSYbXetPpeaPPSN9LZccJJWTv0gKwEdVgsyyMvNLd51E6tzcmfbmcUR7yrrZCf1sSBRTv0OpbPhvrngLhy/MYQk0tTd2RR6R44rQMurEGF09QNP2eSyosOFg6RHWnrA0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fmgL+j6N; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fmgL+j6N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4501B1F00898; Wed, 30 Sep 2026 15:39:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790782757; bh=/PWVn3+Gjnvzob0vNmaANn+P29ffZzRu6N78DN/X5bU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fmgL+j6Nmqd3qXSLVuwuzi4ckurv6/tJkh4clIvRV8GI1DaQikO8rD106u7TbGTGD h8BMVOcIFABX/P3/29FEDeH9h69w13Md3gy148K1zX23qKRzyH6IGm1nVdYolsBg/j Xp4raV37sITjjKdkgFN9xz8RzXBcrDPlnjEbW3fQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pengpeng Hou , Johannes Berg , Sasha Levin Subject: [PATCH 5.10 157/595] wifi: rsi: avoid reading TKIP MIC keys for non-TKIP ciphers Date: Wed, 30 Sep 2026 17:20:50 +0200 Message-ID: <20260930152351.113172185@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152347.700140858@linuxfoundation.org> References: <20260930152347.700140858@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pengpeng Hou [ Upstream commit 843fe9bc583b7686ca68312ac9319c9240a73c03 ] rsi_hal_load_key() copies tx_mic_key and rx_mic_key from data[16] and data[24] whenever key data is present. Those offsets are only part of the 32-byte TKIP key layout. Shorter keys used by other ciphers, such as CCMP, do not provide those bytes, so the unconditional copies can read past the supplied key buffer. Only copy the MIC keys for TKIP, and reject malformed TKIP keys that are shorter than the expected 32-byte layout. Signed-off-by: Pengpeng Hou Link: https://patch.msgid.link/20260701053414.34015-1-pengpeng@iscas.ac.cn [drop useless length check] Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c index 9000a5d510034..74c8ea9795176 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c +++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c @@ -848,8 +848,10 @@ int rsi_hal_load_key(struct rsi_common *common, } else { memcpy(&set_key->key[0][0], data, key_len); } - memcpy(set_key->tx_mic_key, &data[16], 8); - memcpy(set_key->rx_mic_key, &data[24], 8); + if (cipher == WLAN_CIPHER_SUITE_TKIP) { + memcpy(set_key->tx_mic_key, &data[16], 8); + memcpy(set_key->rx_mic_key, &data[24], 8); + } } else { memset(&set_key[FRAME_DESC_SZ], 0, frame_len - FRAME_DESC_SZ); } -- 2.53.0