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 C4206216A3D; Wed, 25 Sep 2024 12:12:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727266375; cv=none; b=Q5xAX4prcZ6RI/79R/UdLi6GsbRs79sQOrgOGytvjMamlS1RCGJ5q5gz962MudVQYprzpcwuNkmDH5yESV6bnmkEuRfrZiDkqCHsHRAcknUL/8hCsLLin6zXsB2z/6uRUk7zFZm7a3fXlLG4TtzJruZXaPk/B2/R/ezH+abHoSg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727266375; c=relaxed/simple; bh=jJUfpjmwhJsF7UnpSXZZrof5Jsc4qCO7Lf8A0gmCb7o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dh/EtG4j9Bc4FOM3Mc5KNW7xnP1ZPgGqr33lrlQCvI3OVyH1XAG1DI4WyRt/WtkE4nyuo07dRaBxufh2eXCcGJuOwhNKvGZvet1NQRWzDCqi+73tCoL7s1KaNxl+/g/RccGfRiXoB9lysa7v+cuRtvcfh3PFvnmqrltx1J0FwV0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iWOFpQYg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iWOFpQYg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87AF2C4CEC3; Wed, 25 Sep 2024 12:12:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727266375; bh=jJUfpjmwhJsF7UnpSXZZrof5Jsc4qCO7Lf8A0gmCb7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iWOFpQYgtuffxhLVnfR33SY+zcvng910zVeB0jDEIA0S2o4qSd7VfekX8rPlX7tp+ XnRuRrMg8Zhk7prh/aOdHUDzHSL7K31O/OG4ZPHK40ksHEdarjyK/NytehLp7DfkB7 0jWMTCFxitNDFuCx9Nn67YjiS19YBjiyo9ETVKH13ydMSoB3jB1iP9Z6TZ/zgUxNTr Lmfs0wwr86+jk7TF8CJqmqNKXdBe6XD5T/8ysXK7Sz0xheacQ2tqLp7jpDUCH2dWCy 7OFkksDQJNqWrdKX6Rg6WJPE+Ogm0X1XYrq6FvAfnYjK8xlQ4CO+164Hnnl8arfTmk zSW8+cj60q0mQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ping-Ke Shih , Sasha Levin , kvalo@kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 037/139] wifi: rtw89: correct base HT rate mask for firmware Date: Wed, 25 Sep 2024 08:07:37 -0400 Message-ID: <20240925121137.1307574-37-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925121137.1307574-1-sashal@kernel.org> References: <20240925121137.1307574-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.52 Content-Transfer-Encoding: 8bit From: Ping-Ke Shih [ Upstream commit 45742881f9eee2a4daeb6008e648a460dd3742cd ] Coverity reported that u8 rx_mask << 24 will become signed 32 bits, which casting to unsigned 64 bits will do sign extension. For example, putting 0x80000000 (signed 32 bits) to a u64 variable will become 0xFFFFFFFF_80000000. The real case we meet is: rx_mask[0...3] = ff ff 00 00 ra_mask = 0xffffffff_ff0ff000 After this fix: rx_mask[0...3] = ff ff 00 00 ra_mask = 0x00000000_ff0ff000 Fortunately driver does bitwise-AND with incorrect ra_mask and supported rates (1ss and 2ss rate only) afterward, so the final rate mask of original code is still correct. Addresses-Coverity-ID: 1504762 ("Unintended sign extension") Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/20240809072012.84152-5-pkshih@realtek.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw89/phy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c index 7139146cb3fad..fac83b718a30c 100644 --- a/drivers/net/wireless/realtek/rtw89/phy.c +++ b/drivers/net/wireless/realtek/rtw89/phy.c @@ -284,8 +284,8 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev, csi_mode = RTW89_RA_RPT_MODE_HT; ra_mask |= ((u64)sta->deflink.ht_cap.mcs.rx_mask[3] << 48) | ((u64)sta->deflink.ht_cap.mcs.rx_mask[2] << 36) | - (sta->deflink.ht_cap.mcs.rx_mask[1] << 24) | - (sta->deflink.ht_cap.mcs.rx_mask[0] << 12); + ((u64)sta->deflink.ht_cap.mcs.rx_mask[1] << 24) | + ((u64)sta->deflink.ht_cap.mcs.rx_mask[0] << 12); high_rate_masks = rtw89_ra_mask_ht_rates; if (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_RX_STBC) stbc_en = 1; -- 2.43.0