Skip to content

Commit

Permalink
virtio: console: Prevent userspace from submitting NULL buffers
Browse files Browse the repository at this point in the history
A userspace could submit a buffer with 0 length to be written to the
host.  Prevent such a situation.

This was not needed previously, but recent changes in the way write()
works exposed this condition to trigger a virtqueue event to the host,
causing a NULL buffer to be sent across.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
CC: stable@kernel.org
  • Loading branch information
Amit Shah authored and Rusty Russell committed Sep 21, 2010
1 parent 6df7aad commit 6574542
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/char/virtio_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,10 @@ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
ssize_t ret;
bool nonblock;

/* Userspace could be out to fool us */
if (!count)
return 0;

port = filp->private_data;

nonblock = filp->f_flags & O_NONBLOCK;
Expand Down

0 comments on commit 6574542

Please sign in to comment.