lkml.org 
[lkml]   [2019]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 88/88] vhost/vsock: fix uninitialized vhost_vsock->guest_cid
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stefan Hajnoczi <stefanha@redhat.com>

    commit a72b69dc083a931422cc8a5e33841aff7d5312f2 upstream.

    The vhost_vsock->guest_cid field is uninitialized when /dev/vhost-vsock
    is opened until the VHOST_VSOCK_SET_GUEST_CID ioctl is called.

    kvmalloc(..., GFP_KERNEL | __GFP_RETRY_MAYFAIL) does not zero memory.
    All other vhost_vsock fields are initialized explicitly so just
    initialize this field too.

    Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Cc: Daniel Verkamp <dverkamp@chromium.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
    index c9de9c41aa97..5a5e981bd8e4 100644
    --- a/drivers/vhost/vsock.c
    +++ b/drivers/vhost/vsock.c
    @@ -518,6 +518,8 @@ static int vhost_vsock_dev_open(struct inode *inode, struct file *file)
    goto out;
    }

    + vsock->guest_cid = 0; /* no CID assigned yet */
    +
    atomic_set(&vsock->queued_replies, 0);

    vqs[VSOCK_VQ_TX] = &vsock->vqs[VSOCK_VQ_TX];

    \
     
     \ /
      Last update: 2019-01-11 15:21    [W:4.249 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site