Skip to content

Commit fa033de

Browse files
danielj-mellanoxkuba-moo
authored andcommitted
virtio_net: Fix missed rtnl_unlock
The rtnl_lock would stay locked if allocating promisc_allmulti failed. Also changed the allocation to GFP_KERNEL. Fixes: ff7c7d9 ("virtio_net: Remove command data from control_buf") Reported-by: Eric Dumazet <edumaset@google.com> Link: https://lore.kernel.org/netdev/CANn89iLazVaUCvhPm6RPJJ0owra_oFnx7Fhc8d60gV-65ad3WQ@mail.gmail.com/ Signed-off-by: Daniel Jurgens <danielj@nvidia.com> Reviewed-by: Brett Creeley <brett.creeley@amd.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Link: https://lore.kernel.org/r/20240515163125.569743-1-danielj@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent e03e7f2 commit fa033de

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/net/virtio_net.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2902,14 +2902,14 @@ static void virtnet_rx_mode_work(struct work_struct *work)
29022902
if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_RX))
29032903
return;
29042904

2905-
rtnl_lock();
2906-
2907-
promisc_allmulti = kzalloc(sizeof(*promisc_allmulti), GFP_ATOMIC);
2905+
promisc_allmulti = kzalloc(sizeof(*promisc_allmulti), GFP_KERNEL);
29082906
if (!promisc_allmulti) {
29092907
dev_warn(&dev->dev, "Failed to set RX mode, no memory.\n");
29102908
return;
29112909
}
29122910

2911+
rtnl_lock();
2912+
29132913
*promisc_allmulti = !!(dev->flags & IFF_PROMISC);
29142914
sg_init_one(sg, promisc_allmulti, sizeof(*promisc_allmulti));
29152915

0 commit comments

Comments
 (0)