4.14-stable review patch.  If anyone has any objections, please let me know.

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

From: Stefan Hajnoczi <stefa...@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 <stefa...@redhat.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Cc: Daniel Verkamp <dverk...@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/vhost/vsock.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -522,6 +522,8 @@ static int vhost_vsock_dev_open(struct i
                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];


Reply via email to