lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 122/339] vdpa: Fix error logic in vdpa_nl_cmd_dev_get_doit
    Date
    From: Eli Cohen <elic@nvidia.com>

    [ Upstream commit 7a6691f1f89784f775fa0c54be57533445726068 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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


    \
     
     \ /
      Last update: 2022-06-13 15:47    [W:4.206 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site