[PATCH net-next v2 4/4] virtio_net: Allocate rss_hdr with devres

[Akihiko Odaki]

virtnet_probe() lacks the code to free rss_hdr in its error path.
Allocate rss_hdr with devres so that it will be automatically freed.

Fixes: 86a48a00efdf ("virtio_net: Support dynamic rss indirection table size")
Signed-off-by: Akihiko Odaki <akihiko.od...@daynix.com>
Acked-by: Jason Wang <jasow...@redhat.com>
Tested-by: Lei Yang <leiy...@redhat.com>
Acked-by: Michael S. Tsirkin <m...@redhat.com>
---
 drivers/net/virtio_net.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 570f77534dfb..6efec9c50b25 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -3580,7 +3580,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, 
u16 queue_pairs)
        if (vi->has_rss && !netif_is_rxfh_configured(dev)) {
                old_rss_hdr = vi->rss_hdr;
                old_rss_trailer = vi->rss_trailer;
-               vi->rss_hdr = kzalloc(virtnet_rss_hdr_size(vi), GFP_KERNEL);
+               vi->rss_hdr = devm_kzalloc(&dev->dev, virtnet_rss_hdr_size(vi), 
GFP_KERNEL);
                if (!vi->rss_hdr) {
                        vi->rss_hdr = old_rss_hdr;
                        return -ENOMEM;
@@ -3591,7 +3591,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, 
u16 queue_pairs)
 
                if (!virtnet_commit_rss_command(vi)) {
                        /* restore ctrl_rss if commit_rss_command failed */
-                       kfree(vi->rss_hdr);
+                       devm_kfree(&dev->dev, vi->rss_hdr);
                        vi->rss_hdr = old_rss_hdr;
                        vi->rss_trailer = old_rss_trailer;
 
@@ -3599,7 +3599,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, 
u16 queue_pairs)
                                 queue_pairs);
                        return -EINVAL;
                }
-               kfree(old_rss_hdr);
+               devm_kfree(&dev->dev, old_rss_hdr);
                goto succ;
        }
 
@@ -6702,7 +6702,7 @@ static int virtnet_probe(struct virtio_device *vdev)
                        virtio_cread16(vdev, offsetof(struct virtio_net_config,
                                rss_max_indirection_table_length));
        }
-       vi->rss_hdr = kzalloc(virtnet_rss_hdr_size(vi), GFP_KERNEL);
+       vi->rss_hdr = devm_kzalloc(&vdev->dev, virtnet_rss_hdr_size(vi), 
GFP_KERNEL);
        if (!vi->rss_hdr) {
                err = -ENOMEM;
                goto free;
@@ -6985,8 +6985,6 @@ static void virtnet_remove(struct virtio_device *vdev)
 
        remove_vq_common(vi);
 
-       kfree(vi->rss_hdr);
-
        free_netdev(vi->dev);
 }
 

-- 
2.48.1