Jason Wang
2022-May-10 02:40 UTC
[PATCH v4 1/3] vdpa: Fix error logic in vdpa_nl_cmd_dev_get_doit
On Mon, May 9, 2022 at 12:33 AM Eli Cohen <elic at nvidia.com> wrote:> > In vdpa_nl_cmd_dev_get_doit(), ff the call to genlmsg_reply() fails weI guess you mean "if" here?> must not call nlmsg_free() since this is done inside genlmsg_reply(). > > Fix it. > > Fixes: bc0d90ee021f ("vdpa: Enable user to query vdpa device info") > Signed-off-by: Eli Cohen <elic at nvidia.com>Other than the above typo. Acked-by: Jason Wang <jasowang at redhat.com>> --- > drivers/vdpa/vdpa.c | 13 +++++++++---- > 1 file 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; > } > > -- > 2.35.1 >