diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-06-16 09:00:18 -0700 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-07-23 11:40:48 +0200 |
| commit | c89333165f4c64aeea0da08a4e73dd19389f2210 (patch) | |
| tree | b1118ab0678776a48c6c649b2607b2223ce15d63 /drivers | |
| parent | e9761516dfede26497a238c3b1771eafb3f9aedc (diff) | |
Revert "UBUNTU: [Upstream] (evdev) Use driver hint to compute the evdev buffer size (rev2)"
This reverts commit f789717ace2e39811cde1aeed78249b32e3c8562.
Commit 1017c1c6 has a huge security hole, which leaks private events to
listening clients after ungrabbing a device. Embarrassing. Please revert
the interdependent patches f789717a, 1f89879a, 1017c1c6. Henrik will be
back once these patches are physically in the 2.6.36 queue in Dmitry's
tree.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/evdev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 2cf7b3abd6b..463bf1b78f3 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -11,7 +11,6 @@ #define EVDEV_MINOR_BASE 64 #define EVDEV_MINORS 32 #define EVDEV_MIN_BUFFER_SIZE 64 -#define EVDEV_BUF_PACKETS 8 #include <linux/poll.h> #include <linux/sched.h> @@ -798,9 +797,7 @@ static void evdev_cleanup(struct evdev *evdev) static int evdev_compute_buffer_size(struct input_dev *dev) { - int nev = dev->hint_events_per_packet * EVDEV_BUF_PACKETS; - nev = max(nev, EVDEV_MIN_BUFFER_SIZE); - return roundup_pow_of_two(nev); + return EVDEV_MIN_BUFFER_SIZE; } /* |