[PATCH] vdpa: don't free reply skb after genlmsg_reply()

[Paul Moses]

genlmsg_reply() hands the reply skb to netlink, and
netlink_unicast() consumes it on all return paths, whether the
skb is queued successfully or freed on an error path.

vdpa_nl_cmd_dev_config_get_doit() currently jumps to nlmsg_free(msg)
after genlmsg_reply() fails, which can hit the same skb twice.

Return the genlmsg_reply() error directly and keep nlmsg_free()
only for pre-reply failures.

Fixes: ad69dd0bf26b ("vdpa: Introduce query of device config layout")
Cc: sta...@vger.kernel.org
Signed-off-by: Paul Moses <p...@1g4.org>
---
 drivers/vdpa/vdpa.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
index 34874beb0152e..702d3a7772219 100644
--- a/drivers/vdpa/vdpa.c
+++ b/drivers/vdpa/vdpa.c
@@ -1352,15 +1352,19 @@ static int vdpa_nl_cmd_dev_config_get_doit(struct 
sk_buff *skb, struct genl_info
        }
        err = vdpa_dev_config_fill(vdev, msg, info->snd_portid, info->snd_seq,
                                   0, info->extack);
-       if (!err)
-               err = genlmsg_reply(msg, info);
+       if (err)
+               goto mdev_err;
+
+       put_device(dev);
+       up_read(&vdpa_dev_lock);
+
+       return genlmsg_reply(msg, info);
 
 mdev_err:
        put_device(dev);
 dev_err:
        up_read(&vdpa_dev_lock);
-       if (err)
-               nlmsg_free(msg);
+       nlmsg_free(msg);
        return err;
 }
 
-- 
2.53.GIT