]> git.baikalelectronics.ru Git - kernel.git/commitdiff
wifi: mac80211_hwsim: add back erroneously removed cast
authorJohannes Berg <johannes.berg@intel.com>
Mon, 11 Jul 2022 11:14:24 +0000 (13:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Aug 2022 09:17:18 +0000 (11:17 +0200)
commit 0c94b888b542d86899d305d6cbbe306ba5b3eb01 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@intel.com>
Fixes: 2e05bcefd0a8 ("wifi: mac80211_hwsim: fix race condition in pending packet")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Cc: Jeongik Cha <jeongik@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/mac80211_hwsim.c

index da81e2d1da5c2340a7a56ef3ce7b521e5c6cbb28..1e7d2ef3de0a57f0811b0688ad624d86b1e0e3fc 100644 (file)
@@ -3289,7 +3289,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
                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);