]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Input: evdev - fix variable initialisation
authorHeiko Stübner <heiko@sntech.de>
Thu, 9 Feb 2012 07:08:48 +0000 (23:08 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 24 Feb 2012 08:52:43 +0000 (00:52 -0800)
Commit 509f87c5f564 (evdev - do not block waiting for an event if fd
is nonblock) created a code path were it was possible to use retval
uninitialized.

This could lead to the xorg evdev input driver getting corrupt data
and refusing to work with log messages like
AUO-Pixcir touchscreen: Read error: Success
sg060_keys: Read error: Success
AUO-Pixcir touchscreen: Read error: Success
sg060_keys: Read error: Success
(for drivers auo-pixcir-ts and gpio-keys).

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Dima Zavin <dima@android.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/evdev.c

index afc166fcc3d9c41ad6654bae17d5c893382c3705..7df5bfef2624d5c1e49bd39208135c29aaed8653 100644 (file)
@@ -332,7 +332,7 @@ static ssize_t evdev_write(struct file *file, const char __user *buffer,
        struct evdev_client *client = file->private_data;
        struct evdev *evdev = client->evdev;
        struct input_event event;
-       int retval;
+       int retval = 0;
 
        if (count < input_event_size())
                return -EINVAL;