From 77cd6d5d7093f70932ffb29428f2a911322b1a31 Mon Sep 17 00:00:00 2001
From: Amit Shah <amit.shah@redhat.com>
Date: Tue, 14 Sep 2010 13:26:16 +0530
Subject: [PATCH] --- yaml --- r: 210856 b: refs/heads/master c:
 65745422a898741ee0e7068ef06624ab06e8aefa h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/char/virtio_console.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ac2f995673c1..0ca7c0a4918d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6df7aadcd9290807c464675098b5dd2dc9da5075
+refs/heads/master: 65745422a898741ee0e7068ef06624ab06e8aefa
diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c
index 2f2e31b58b34..c810481a5bc2 100644
--- a/trunk/drivers/char/virtio_console.c
+++ b/trunk/drivers/char/virtio_console.c
@@ -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;