Input: evdev - fix variable initialisation

PATCH Applied Heiko Stübner 3 participants 3 messages Jan 31, 2012 – Feb 3, 2012

Subsystems (2)

HID Input drivers

lore

Share & tools

lore

Heiko Stübner

author

2012-01-31 21:24 UTC #0 lore raw

PATCH 1/1 Input: evdev - fix variable initialisation

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 <[email protected]>

---
This is obviously meant as a fix for 3.3

 drivers/input/evdev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/input/evdev.c +1 -1

index 76457d5..afc166f 100644
@@ -386,7 +386,7 @@ static ssize_t evdev_read(struct file *file, 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;

Signature · 1 line

1.7.2.3

Dima Zavin

Acked-by on v1 1/1

2012-01-31 21:40 UTC #1 lore raw

ugh, thanks for fixing this.

Quoted 12 lines · Heiko Stübner

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).

Quoted 1 line

Signed-off-by Heiko Stuebner <[email protected]>

Acked-by Dima Zavin <[email protected]>

Quoted 20 lines

---
This is obviously meant as a fix for 3.3

drivers/input/evdev.c | 2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/input/evdev.c +1 -2

index 76457d5..afc166f 100644
@@ -386,7 +386,7 @@ static ssize_t evdev_read(struct file *file, 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;
--

Quoted 1 line

1.7.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Dmitry Torokhov

maintainer Applied

2012-02-03 08:37 UTC #2 lore raw

Quoted 15 lines · Dima Zavin

ugh, thanks for fixing this.
Quoted 12 lines · Heiko Stübner
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).

Quoted 4 lines

Quoted 1 line
Signed-off-by Heiko Stuebner <[email protected]>
Acked-by Dima Zavin <[email protected]>

Applied, thank you.

Signature · 1 line

Dmitry