vhost/vsock: fix uninitialized vhost_vsock->guest_cid

stefanhaRH · mstsirkin · commit a72b69dc083a · 2017-11-14T23:57:40.000+02:00
The vhost_vsock-&gt;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 &lt;stefanha@redhat.com&gt;
Signed-off-by: Michael S. Tsirkin &lt;mst@redhat.com&gt;
diff --git 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];

Original file line number	Diff line number	Diff line change
`@@ -518,6 +518,8 @@ static int vhost_vsock_dev_open(struct inode inode, struct file file)`
`518`	`518`	`goto out;`
`519`	`519`	`}`
`520`	`520`
	`521`	`+ vsock->guest_cid = 0; /* no CID assigned yet */`
	`522`	`+`
`521`	`523`	`atomic_set(&vsock->queued_replies, 0);`
`522`	`524`
`523`	`525`	`vqs[VSOCK_VQ_TX] = &vsock->vqs[VSOCK_VQ_TX];`