]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
Input: evdev - only allow reading events if a full packet is present
authorDima Zavin <dima@android.com>
Fri, 30 Dec 2011 23:16:44 +0000 (15:16 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 30 Dec 2011 23:26:34 +0000 (15:26 -0800)
Without this, it was possible for the reader to get ahead of packet_head.
If the input device generated a partial packet *right* after the reader
got ahead, then we can get into a situation where the device is marked
readable, but read always returns 0 until the next packet is finished
(i.e a SYN is generated by the input driver).

This situation can also happen if we overflow the buffer while a reader
is trying to read an event out.

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

index 4cf25347b01546b1578e0b9987d6717c38db0366..03344b3c7c15e6ee4135640039e55459a63da32f 100644 (file)
@@ -369,7 +369,7 @@ static int evdev_fetch_next_event(struct evdev_client *client,
 
        spin_lock_irq(&client->buffer_lock);
 
-       have_event = client->head != client->tail;
+       have_event = client->packet_head != client->tail;
        if (have_event) {
                *event = client->buffer[client->tail++];
                client->tail &= client->bufsize - 1;