summaryrefslogtreecommitdiffstats
path: root/drivers/vdpa/vdpa.c
diff options
context:
space:
mode:
authorEli Cohen <elic@nvidia.com>2022-05-18 15:37:59 +0200
committerMichael S. Tsirkin <mst@redhat.com>2022-05-31 18:44:20 +0200
commit7a6691f1f89784f775fa0c54be57533445726068 (patch)
tree114bb8e2d120fea0ed54c2ebddc4ce3da66444ba /drivers/vdpa/vdpa.c
parentMerge tag 'for-5.19/fbdev-1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
downloadlinux-7a6691f1f89784f775fa0c54be57533445726068.tar.xz
linux-7a6691f1f89784f775fa0c54be57533445726068.zip
vdpa: Fix error logic in vdpa_nl_cmd_dev_get_doit
In vdpa_nl_cmd_dev_get_doit(), if the call to genlmsg_reply() fails we must not call nlmsg_free() since this is done inside genlmsg_reply(). Fix it. Fixes: bc0d90ee021f ("vdpa: Enable user to query vdpa device info") Reviewed-by: Si-Wei Liu <si-wei.liu@oracle.com> Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Eli Cohen <elic@nvidia.com> Message-Id: <20220518133804.1075129-2-elic@nvidia.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vdpa/vdpa.c')
-rw-r--r--drivers/vdpa/vdpa.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
index 2b75c00b1005..fac89a0d8178 100644
--- a/drivers/vdpa/vdpa.c
+++ b/drivers/vdpa/vdpa.c
@@ -756,14 +756,19 @@ static int vdpa_nl_cmd_dev_get_doit(struct sk_buff *skb, struct genl_info *info)
goto mdev_err;
}
err = vdpa_dev_fill(vdev, msg, info->snd_portid, info->snd_seq, 0, info->extack);
- if (!err)
- err = genlmsg_reply(msg, info);
+ if (err)
+ goto mdev_err;
+
+ err = genlmsg_reply(msg, info);
+ put_device(dev);
+ mutex_unlock(&vdpa_dev_mutex);
+ return err;
+
mdev_err:
put_device(dev);
err:
mutex_unlock(&vdpa_dev_mutex);
- if (err)
- nlmsg_free(msg);
+ nlmsg_free(msg);
return err;
}