Re: linux-next: Tree for July 30
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2008-07-31 14:09:26
Also in:
linux-next, lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
On Wed, Jul 30, 2008 at 11:10:29PM -0700, Andrew Morton wrote:
On Wed, 30 Jul 2008 17:06:35 +1000 Stephen Rothwell [off-list ref] wrote:quoted
I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.gitThe X server broke on my FC8 t61p thinkpad. Mainline is OK. Various information is at http://userweb.kernel.org/~akpm/mo/ I'm suspecting the input layer - my synaptics device seems to have disappeared? See http://userweb.kernel.org/~akpm/mo/Xorg-log-diff.txt
I think this patch should help with Synaptics: From: Dmitry Torokhov <dmitry.torokhov@gmail.com> Subject: [PATCH] Fix crash on kernels with extended keymap space The len argument of EVIOCGBIT(ev,len) is the size of the receiving buffer in bytes, not maximim number of bits to retrieve. Signed-off-by: Dmitry Torokhov <redacted> --- eventcomm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/eventcomm.c b/eventcomm.c
index e3257cd..2d0a347 100644
--- a/eventcomm.c
+++ b/eventcomm.c@@ -89,7 +89,7 @@ event_query_is_touchpad(int fd) /* Check for ABS_X, ABS_Y, ABS_PRESSURE and BTN_TOOL_FINGER */ - SYSCALL(ret = ioctl(fd, EVIOCGBIT(0, EV_MAX), evbits)); + SYSCALL(ret = ioctl(fd, EVIOCGBIT(0, sizeof(evbits)), evbits)); if (ret < 0) return FALSE; if (!TEST_BIT(EV_SYN, evbits) ||
@@ -97,7 +97,7 @@ event_query_is_touchpad(int fd) !TEST_BIT(EV_KEY, evbits)) return FALSE; - SYSCALL(ret = ioctl(fd, EVIOCGBIT(EV_ABS, KEY_MAX), evbits)); + SYSCALL(ret = ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(evbits)), evbits)); if (ret < 0) return FALSE; if (!TEST_BIT(ABS_X, evbits) ||
@@ -105,7 +105,7 @@ event_query_is_touchpad(int fd) !TEST_BIT(ABS_PRESSURE, evbits)) return FALSE; - SYSCALL(ret = ioctl(fd, EVIOCGBIT(EV_KEY, KEY_MAX), evbits)); + SYSCALL(ret = ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(evbits)), evbits)); if (ret < 0) return FALSE; if (!TEST_BIT(BTN_TOOL_FINGER, evbits))
--
1.5.5.1