diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-15 17:35:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-15 17:35:02 -0400 |
commit | 2f3f056685198e9fc76c23bd88fbe2662ab7b044 (patch) | |
tree | 98ee7ade3620cac729ce85434fd85e84e411ea64 /drivers/vhost/vhost.c | |
parent | 4c5e8fc62d6a63065eeae80808c498d1dcfea4f4 (diff) | |
parent | 2eb98105f8c7f4b867f7f714a998f5b8c1bb009b (diff) |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin:
"virtio, vhost: features, fixes
- PCI virtual function support for virtio
- DMA barriers for virtio strong barriers
- bugfixes"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio: update the comments for transport features
virtio_pci: support enabling VFs
vhost: fix info leak due to uninitialized memory
virtio_ring: switch to dma_XX barriers for rpmsg
Diffstat (limited to 'drivers/vhost/vhost.c')
-rw-r--r-- | drivers/vhost/vhost.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index ce8c95b6365b..a502f1af4a21 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c | |||
@@ -2349,6 +2349,9 @@ struct vhost_msg_node *vhost_new_msg(struct vhost_virtqueue *vq, int type) | |||
2349 | struct vhost_msg_node *node = kmalloc(sizeof *node, GFP_KERNEL); | 2349 | struct vhost_msg_node *node = kmalloc(sizeof *node, GFP_KERNEL); |
2350 | if (!node) | 2350 | if (!node) |
2351 | return NULL; | 2351 | return NULL; |
2352 | |||
2353 | /* Make sure all padding within the structure is initialized. */ | ||
2354 | memset(&node->msg, 0, sizeof node->msg); | ||
2352 | node->vq = vq; | 2355 | node->vq = vq; |
2353 | node->msg.type = type; | 2356 | node->msg.type = type; |
2354 | return node; | 2357 | return node; |