Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14c2cd93 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Greg Kroah-Hartman
Browse files

vhost/vsock: fix uninitialized vhost_vsock->guest_cid 



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: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Cc: Daniel Verkamp <dverkamp@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f33700b

drivers/vhost/vsock.c

+2 −0
Original line number Diff line number Diff line
@@ -522,6 +522,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];