Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da8a8d77 authored by Johannes Berg's avatar Johannes Berg Committed by Weilun Du
Browse files

UPSTREAM: wifi: mac80211_hwsim: use 32-bit skb cookie 



commit cc5250cdb43d444061412df7fae72d2b4acbdf97 upstream.

We won't really have enough skbs to need a 64-bit cookie,
and on 32-bit platforms storing the 64-bit cookie into the
void *rate_driver_data doesn't work anyway. Switch back to
using just a 32-bit cookie and uintptr_t for the type to
avoid compiler warnings about all this.

Fixes: 4ee186fa7e40 ("wifi: mac80211_hwsim: fix race condition in pending packet")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Cc: Jeongik Cha <jeongik@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 6dece5ad6e1e7d8c2bacfae606dc6f18a18c51e0)
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
Bug: 236994625
Change-Id: I81b075297ec2248f706aebc914cd5e2783665bbc
parent 85f80951

drivers/net/wireless/mac80211_hwsim.c

+5 −5
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ struct mac80211_hwsim_data { 
	bool ps_poll_pending;

	struct dentry *debugfs;



	atomic64_t pending_cookie;

	atomic_t pending_cookie;

	struct sk_buff_head pending;	/* packets pending */

	/*

	 * Only radios in the same group can communicate together (the
@@ -1097,7 +1097,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, 
	int i;

	struct hwsim_tx_rate tx_attempts[IEEE80211_TX_MAX_RATES];

	struct hwsim_tx_rate_flag tx_attempts_flags[IEEE80211_TX_MAX_RATES];

	u64 cookie;

	uintptr_t cookie;



	if (data->ps != PS_DISABLED)

		hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);
@@ -1166,7 +1166,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, 
		goto nla_put_failure;



	/* We create a cookie to identify this skb */

	cookie = (u64)atomic64_inc_return(&data->pending_cookie);

	cookie = atomic_inc_return(&data->pending_cookie);

	info->rate_driver_data[0] = (void *)cookie;

	if (nla_put_u64_64bit(skb, HWSIM_ATTR_COOKIE, cookie, HWSIM_ATTR_PAD))

		goto nla_put_failure;
@@ -3350,10 +3350,10 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2, 
	/* look for the skb matching the cookie passed back from user */

	spin_lock_irqsave(&data2->pending.lock, flags);

	skb_queue_walk_safe(&data2->pending, skb, tmp) {

		u64 skb_cookie;

		uintptr_t skb_cookie;



		txi = IEEE80211_SKB_CB(skb);

		skb_cookie = (u64)(uintptr_t)txi->rate_driver_data[0];

		skb_cookie = (uintptr_t)txi->rate_driver_data[0];



		if (skb_cookie == ret_skb_cookie) {

			__skb_unlink(skb, &data2->pending);