This is a note to let you know that I've just added the patch titled
wifi: mac80211_hwsim: add back erroneously removed cast
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
wifi-mac80211_hwsim-add-back-erroneously-removed-cast.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 58b6259d820d63c2adf1c7541b54cce5a2ae6073 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Mon, 11 Jul 2022 13:14:24 +0200
Subject: wifi: mac80211_hwsim: add back erroneously removed cast
From: Johannes Berg <johannes.berg@xxxxxxxxx>
commit 58b6259d820d63c2adf1c7541b54cce5a2ae6073 upstream.
The robots report that we're now casting to a differently
sized integer, which is correct, and the previous patch
had erroneously removed it.
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Fixes: 4ee186fa7e40 ("wifi: mac80211_hwsim: fix race condition in pending packet")
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Cc: Jeongik Cha <jeongik@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/mac80211_hwsim.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -3614,7 +3614,7 @@ static int hwsim_tx_info_frame_received_
u64 skb_cookie;
txi = IEEE80211_SKB_CB(skb);
- skb_cookie = (u64)txi->rate_driver_data[0];
+ skb_cookie = (u64)(uintptr_t)txi->rate_driver_data[0];
if (skb_cookie == ret_skb_cookie) {
__skb_unlink(skb, &data2->pending);
Patches currently in stable-queue which might be from johannes.berg@xxxxxxxxx are
queue-5.15/wifi-mac80211_hwsim-use-32-bit-skb-cookie.patch
queue-5.15/wifi-mac80211_hwsim-add-back-erroneously-removed-cast.patch
queue-5.15/wifi-mac80211_hwsim-fix-race-condition-in-pending-packet.patch
