virtio: console: Prevent userspace from submitting NULL buffers
authorAmit Shah <amit.shah@redhat.com>
Tue, 14 Sep 2010 07:56:16 +0000 (13:26 +0530)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 21 Sep 2010 01:24:01 +0000 (10:54 +0930)
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
drivers/char/virtio_console.c

index 2f2e31b58b3452aa5136b4448541ada38db75092..c810481a5bc23ae3ca57127729c83e454d681534 100644 (file)
@@ -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;