Commit d40de0ad authored by EN-WEI WU's avatar EN-WEI WU Committed by Johannes Berg

wifi: mac80211_hwsim: avoid calling nlmsg_free() in IRQ or IRQ disabled

The nlmsg_free() ends up calling kfree_skb(), and kfree_skb() is not allowed to be called
from hardware interrupt context or with hardware interrupts being disabled. Replace the
mistaken usage of nlmsg_free() by dev_kfree_skb_irq(), which is safe in both cases.
Signed-off-by: default avatarEN-WEI WU <enweiwu@FreeBSD.org>
Link: https://lore.kernel.org/r/20230815095427.13589-1-enweiwu@FreeBSD.orgSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 92752117
...@@ -6315,7 +6315,7 @@ static void hwsim_virtio_tx_done(struct virtqueue *vq) ...@@ -6315,7 +6315,7 @@ static void hwsim_virtio_tx_done(struct virtqueue *vq)
spin_lock_irqsave(&hwsim_virtio_lock, flags); spin_lock_irqsave(&hwsim_virtio_lock, flags);
while ((skb = virtqueue_get_buf(vq, &len))) while ((skb = virtqueue_get_buf(vq, &len)))
nlmsg_free(skb); dev_kfree_skb_irq(skb);
spin_unlock_irqrestore(&hwsim_virtio_lock, flags); spin_unlock_irqrestore(&hwsim_virtio_lock, flags);
} }
...@@ -6384,14 +6384,14 @@ static void hwsim_virtio_rx_work(struct work_struct *work) ...@@ -6384,14 +6384,14 @@ static void hwsim_virtio_rx_work(struct work_struct *work)
spin_lock_irqsave(&hwsim_virtio_lock, flags); spin_lock_irqsave(&hwsim_virtio_lock, flags);
if (!hwsim_virtio_enabled) { if (!hwsim_virtio_enabled) {
nlmsg_free(skb); dev_kfree_skb_irq(skb);
goto out_unlock; goto out_unlock;
} }
vq = hwsim_vqs[HWSIM_VQ_RX]; vq = hwsim_vqs[HWSIM_VQ_RX];
sg_init_one(sg, skb->head, skb_end_offset(skb)); sg_init_one(sg, skb->head, skb_end_offset(skb));
err = virtqueue_add_inbuf(vq, sg, 1, skb, GFP_ATOMIC); err = virtqueue_add_inbuf(vq, sg, 1, skb, GFP_ATOMIC);
if (WARN(err, "virtqueue_add_inbuf returned %d\n", err)) if (WARN(err, "virtqueue_add_inbuf returned %d\n", err))
nlmsg_free(skb); dev_kfree_skb_irq(skb);
else else
virtqueue_kick(vq); virtqueue_kick(vq);
schedule_work(&hwsim_virtio_rx); schedule_work(&hwsim_virtio_rx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment