Skip to content

Commit 8c04278

Browse files
eknoesjmberg-intel
authored andcommitted
wifi: mac80211_hwsim: check length for virtio packets
An invalid packet with a length shorter than the specified length in the netlink header can lead to use-after-frees and slab-out-of-bounds in the processing of the netlink attributes, such as the following: BUG: KASAN: slab-out-of-bounds in __nla_validate_parse+0x1258/0x2010 Read of size 2 at addr ffff88800ac7952c by task kworker/0:1/12 Workqueue: events hwsim_virtio_rx_work Call Trace: <TASK> dump_stack_lvl+0x45/0x5d print_report.cold+0x5e/0x5e5 kasan_report+0xb1/0x1c0 __nla_validate_parse+0x1258/0x2010 __nla_parse+0x22/0x30 hwsim_virtio_handle_cmd.isra.0+0x13f/0x2d0 hwsim_virtio_rx_work+0x1b2/0x370 process_one_work+0x8df/0x1530 worker_thread+0x575/0x11a0 kthread+0x29d/0x340 ret_from_fork+0x22/0x30 </TASK> Discarding packets with an invalid length solves this. Therefore, skb->len must be set at reception. Change-Id: Ieaeb9a4c62d3beede274881a7c2722c6c6f477b6 Signed-off-by: Soenke Huster <soenke.huster@eknoes.de> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 6937180 commit 8c04278

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

drivers/net/wireless/mac80211_hwsim.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5060,6 +5060,10 @@ static int hwsim_virtio_handle_cmd(struct sk_buff *skb)
50605060

50615061
nlh = nlmsg_hdr(skb);
50625062
gnlh = nlmsg_data(nlh);
5063+
5064+
if (skb->len < nlh->nlmsg_len)
5065+
return -EINVAL;
5066+
50635067
err = genlmsg_parse(nlh, &hwsim_genl_family, tb, HWSIM_ATTR_MAX,
50645068
hwsim_genl_policy, NULL);
50655069
if (err) {
@@ -5102,7 +5106,8 @@ static void hwsim_virtio_rx_work(struct work_struct *work)
51025106
spin_unlock_irqrestore(&hwsim_virtio_lock, flags);
51035107

51045108
skb->data = skb->head;
5105-
skb_set_tail_pointer(skb, len);
5109+
skb_reset_tail_pointer(skb);
5110+
skb_put(skb, len);
51065111
hwsim_virtio_handle_cmd(skb);
51075112

51085113
spin_lock_irqsave(&hwsim_virtio_lock, flags);

0 commit comments

Comments
 (0)