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

Commit 3beb97be authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

wifi: mac80211_hwsim: drop short frames 



[ Upstream commit fba360a047d5eeeb9d4b7c3a9b1c8308980ce9a6 ]

While technically some control frames like ACK are shorter and
end after Address 1, such frames shouldn't be forwarded through
wmediumd or similar userspace, so require the full 3-address
header to avoid accessing invalid memory if shorter frames are
passed in.

Reported-by: default avatar <syzbot+b2645b5bf1512b81fa22@syzkaller.appspotmail.com>
Reviewed-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6773ea99

drivers/net/wireless/mac80211_hwsim.c

+4 −3
Original line number Diff line number Diff line
@@ -3367,14 +3367,15 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2, 
	frame_data_len = nla_len(info->attrs[HWSIM_ATTR_FRAME]);

	frame_data = (void *)nla_data(info->attrs[HWSIM_ATTR_FRAME]);



	if (frame_data_len < sizeof(struct ieee80211_hdr_3addr) ||

	    frame_data_len > IEEE80211_MAX_DATA_LEN)

		goto err;



	/* Allocate new skb here */

	skb = alloc_skb(frame_data_len, GFP_KERNEL);

	if (skb == NULL)

		goto err;



	if (frame_data_len > IEEE80211_MAX_DATA_LEN)

		goto err;



	/* Copy the data */

	skb_put_data(skb, frame_data, frame_data_len);