From patchwork Sat Jul 17 21:37:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 112578 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6HLbK3L008813 for ; Sat, 17 Jul 2010 21:37:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754270Ab0GQVhM (ORCPT ); Sat, 17 Jul 2010 17:37:12 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:48022 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754099Ab0GQVhL (ORCPT ); Sat, 17 Jul 2010 17:37:11 -0400 Received: by pxi14 with SMTP id 14so1366208pxi.19 for ; Sat, 17 Jul 2010 14:37:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=AXA2GrQ8bKIoFUniC9qSW4/tDiuOKjsrLcSahjQZizA=; b=aCBMbYEefkOfQdppLrtJRa6dv3y0FGb5z/NFAQbV3fnGWVe8kC6/53ajlIJvaRNodl 2P3+yRh+Xp+Q7aR5hzXw/Gt0Kkg8ChUruF+6fGP8bSSi/1+x71sLaABcgtZdPx5YBqaa MHbfr3lgD8DECQHlKXq6spZQykld67NVHv6i8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=Fag5WmlECwULKYk4SL2GXRaRywqXVQER0s9ze5EDDQLseeBEKqj/MPRf6FyfUlxn9U +fItK76RbkH/p0ZCFK05XMNroEC+1j4DafzqBO4Rd+xV79Ut2EyQTRJNXVYlMn5uoSEe 5D2bogorEHMnXsYacWRqiEYWEd2AQgQasP6EI= Received: by 10.142.207.9 with SMTP id e9mr3775813wfg.172.1279402630330; Sat, 17 Jul 2010 14:37:10 -0700 (PDT) Received: from mailhub.coreip.homeip.net (c-24-6-153-206.hsd1.ca.comcast.net [24.6.153.206]) by mx.google.com with ESMTPS id z1sm4377344wfd.3.2010.07.17.14.37.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 17 Jul 2010 14:37:09 -0700 (PDT) Date: Sat, 17 Jul 2010 14:37:05 -0700 From: Dmitry Torokhov To: Laurent Pinchart Cc: Amit Kucheria , linux-input@vger.kernel.org, linux-omap@vger.kernel.org, Tony Lindgren Subject: Re: Buffer overrun in the TWL4030 keypad driver with Nokia RX51 Message-ID: <20100717213705.GA22477@core.coreip.homeip.net> References: <201007161728.44227.laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201007161728.44227.laurent.pinchart@ideasonboard.com> User-Agent: Mutt/1.5.20 (2009-12-10) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 17 Jul 2010 21:37:20 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index abdf321..ea32143 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -175,6 +175,10 @@ static void __init rx51_add_gpio_keys(void) #endif /* CONFIG_KEYBOARD_GPIO || CONFIG_KEYBOARD_GPIO_MODULE */ static int board_keymap[] = { + /* + * Note that KEY(x, 8, KEY_XXX) entries represent "entire row + * connected to the ground" matrix state. + */ KEY(0, 0, KEY_Q), KEY(0, 1, KEY_O), KEY(0, 2, KEY_P), @@ -182,6 +186,8 @@ static int board_keymap[] = { KEY(0, 4, KEY_BACKSPACE), KEY(0, 6, KEY_A), KEY(0, 7, KEY_S), +// KEY(0, 8, KEY_F6), // XXX was removed + KEY(1, 0, KEY_W), KEY(1, 1, KEY_D), KEY(1, 2, KEY_F), @@ -190,6 +196,8 @@ static int board_keymap[] = { KEY(1, 5, KEY_J), KEY(1, 6, KEY_K), KEY(1, 7, KEY_L), +// KEY(1, 8, KEY_F7), // XXX was moved to (7, 1) + KEY(2, 0, KEY_E), KEY(2, 1, KEY_DOT), KEY(2, 2, KEY_UP), @@ -197,6 +205,8 @@ static int board_keymap[] = { KEY(2, 5, KEY_Z), KEY(2, 6, KEY_X), KEY(2, 7, KEY_C), + KEY(2, 8, KEY_F9), // XXX was F8 and moved to (7, 2), F9 was (4, 8) + KEY(3, 0, KEY_R), KEY(3, 1, KEY_V), KEY(3, 2, KEY_B), @@ -205,20 +215,24 @@ static int board_keymap[] = { KEY(3, 5, KEY_SPACE), KEY(3, 6, KEY_SPACE), KEY(3, 7, KEY_LEFT), + KEY(4, 0, KEY_T), KEY(4, 1, KEY_DOWN), KEY(4, 2, KEY_RIGHT), KEY(4, 4, KEY_LEFTCTRL), - KEY(4, 5, KEY_RIGHTALT), - KEY(4, 6, KEY_LEFTSHIFT), + KEY(4, 5, KEY_RIGHTALT), // XXX was LEFTSHIFT + KEY(4, 6, KEY_LEFTSHIFT), // XXX was FN which is now removed + KEY(4, 8, KEY_10), // XXX was F9 and moved to (2, 8), F10 was (5, 8) + + KEY(5, 0, KEY_Y), + KEY(5, 8, KEY_11), // XXX was F10 and moved to (4, 8), F11 is new + KEY(6, 0, KEY_U), + KEY(7, 0, KEY_I), - KEY(7, 1, KEY_F7), - KEY(7, 2, KEY_F8), - KEY(0xff, 2, KEY_F9), - KEY(0xff, 4, KEY_F10), - KEY(0xff, 5, KEY_F11), + KEY(7, 1, KEY_F7), // XXX was undefined + KEY(7, 2, KEY_F8), // XXX was undefined }; static struct matrix_keymap_data board_map_data = { diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c index 7aa59e0..fb16b5e 100644 --- a/drivers/input/keyboard/twl4030_keypad.c +++ b/drivers/input/keyboard/twl4030_keypad.c @@ -51,8 +51,12 @@ */ #define TWL4030_MAX_ROWS 8 /* TWL4030 hard limit */ #define TWL4030_MAX_COLS 8 -#define TWL4030_ROW_SHIFT 3 -#define TWL4030_KEYMAP_SIZE (TWL4030_MAX_ROWS * TWL4030_MAX_COLS) +/* + * Note that we add space for an extra column so that we can handle + * row lines connected to the gnd (see twl4030_col_xlate()). + */ +#define TWL4030_ROW_SHIFT 4 +#define TWL4030_KEYMAP_SIZE (TWL4030_MAX_ROWS << TWL4030_ROW_SHIFT) struct twl4030_keypad { unsigned short keymap[TWL4030_KEYMAP_SIZE]; @@ -182,7 +186,7 @@ static int twl4030_read_kp_matrix_state(struct twl4030_keypad *kp, u16 *state) return ret; } -static int twl4030_is_in_ghost_state(struct twl4030_keypad *kp, u16 *key_state) +static bool twl4030_is_in_ghost_state(struct twl4030_keypad *kp, u16 *key_state) { int i; u16 check = 0; @@ -191,12 +195,12 @@ static int twl4030_is_in_ghost_state(struct twl4030_keypad *kp, u16 *key_state) u16 col = key_state[i]; if ((col & check) && hweight16(col) > 1) - return 1; + return true; check |= col; } - return 0; + return false; } static void twl4030_kp_scan(struct twl4030_keypad *kp, bool release_all) @@ -225,7 +229,8 @@ static void twl4030_kp_scan(struct twl4030_keypad *kp, bool release_all) if (!changed) continue; - for (col = 0; col < kp->n_cols; col++) { + /* Extra column handles "all gnd" rows */ + for (col = 0; col < kp->n_cols + 1; col++) { int code; if (!(changed & (1 << col)))