From 7c9986566bbe3134b248666abcc8678ac0364883 Mon Sep 17 00:00:00 2001
From: David Herrmann <dh.herrmann@googlemail.com>
Date: Sun, 29 Jul 2012 22:48:31 -0700
Subject: [PATCH] --- yaml --- r: 328515 b: refs/heads/master c:
 f40033acc2d14acecd1b27a79dc8a0ad437e619a h: refs/heads/master i:   328513:
 99aa3e4683546c0d76d3356913002d2daea94990   328511:
 8ddfb18879f756777999b54ccd6ce69c8c18722d v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/input/misc/uinput.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1eff44ebce5a..e532e453d3a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 929d1af5478dec82903e05aa9662a4ec12ad655b
+refs/heads/master: f40033acc2d14acecd1b27a79dc8a0ad437e619a
diff --git a/trunk/drivers/input/misc/uinput.c b/trunk/drivers/input/misc/uinput.c
index 1b4ee4a5c49c..e74ed9cc6371 100644
--- a/trunk/drivers/input/misc/uinput.c
+++ b/trunk/drivers/input/misc/uinput.c
@@ -476,6 +476,9 @@ static ssize_t uinput_read(struct file *file, char __user *buffer, size_t count,
 	struct input_event event;
 	int retval = 0;
 
+	if (count != 0 && count < input_event_size())
+		return -EINVAL;
+
 	if (udev->state != UIST_CREATED)
 		return -ENODEV;