| Message ID | 20240515151152.564085-1-danielj@nvidia.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] virtio_net: Fix missed rtnl_unlock | expand |
On Wed, May 15, 2024 at 5:12 PM Daniel Jurgens <danielj@nvidia.com> wrote: > > The rtnl_lock would stay locked if allocating promisc_allmulti failed. > > Fixes: ff7c7d9f5261 ("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> > --- > drivers/net/virtio_net.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 19a9b50646c7..e2b7488f375e 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); While we are at this, please change GFP_ATOMIC to GFP_KERNEL here. > 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 >
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 19a9b50646c7..e2b7488f375e 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); 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));
The rtnl_lock would stay locked if allocating promisc_allmulti failed. Fixes: ff7c7d9f5261 ("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> --- drivers/net/virtio_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)