The rtnl_lock would stay locked if allocating promisc_allmulti failed.
Also changed the allocation to GFP_KERNEL.

Fixes: ff7c7d9f5261 ("virtio_net: Remove command data from control_buf")
Reported-by: Eric Dumazet <eduma...@google.com>
Link: 
https://lore.kernel.org/netdev/cann89ilazvaucvhpm6rpjj0owra_ofnx7fhc8d60gv-65ad...@mail.gmail.com/
Signed-off-by: Daniel Jurgens <dani...@nvidia.com>
---
v3:
        - Changed to promisc_allmulti alloc to GPF_KERNEL
v2:
        - Added fixes tag.
---
 drivers/net/virtio_net.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 19a9b50646c7..4e1a0fc0d555 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2902,14 +2902,14 @@ static void virtnet_rx_mode_work(struct work_struct 
*work)
        if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_RX))
                return;
 
-       rtnl_lock();
-
-       promisc_allmulti = kzalloc(sizeof(*promisc_allmulti), GFP_ATOMIC);
+       promisc_allmulti = kzalloc(sizeof(*promisc_allmulti), GFP_KERNEL);
        if (!promisc_allmulti) {
                dev_warn(&dev->dev, "Failed to set RX mode, no memory.\n");
                return;
        }
 
+       rtnl_lock();
+
        *promisc_allmulti = !!(dev->flags & IFF_PROMISC);
        sg_init_one(sg, promisc_allmulti, sizeof(*promisc_allmulti));
 
-- 
2.45.0


Reply via email to