Patchwork Maverick SRU, Input: fix typo in keycode validation supporting large scancodes

login
register
mail settings
Submitter Tim Gardner
Date Jan. 28, 2011, 6:55 p.m.
Message ID <20110128185502.63B78F89F8@sepang.rtg.net>
Download mbox
Permalink /patch/80879/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Pull-request

git://kernel.ubuntu.com/rtg/ubuntu-maverick.git vaio-backlight-lp658198

Comments

Tim Gardner - Jan. 28, 2011, 6:55 p.m.
The following changes since commit ae86ab8935c91281dac1ab943f0ca353bc68ed79:
  Mattia Dongili (1):
        Input: fix typo in keycode validation supporting large scancodes

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-maverick.git vaio-backlight-lp658198


From ae86ab8935c91281dac1ab943f0ca353bc68ed79 Mon Sep 17 00:00:00 2001
From: Mattia Dongili <malattia@linux.it>
Date: Thu, 18 Nov 2010 09:06:43 -0800
Subject: [PATCH] Input: fix typo in keycode validation supporting large scancodes

BugLink: http://bugs.launchpad.net/bugs/658198

Backported from de391d12500ede13faa7ecadbe900a8de1f76cfa
by Tim Gardner <tim.gardner@canonical.com>

Check the input_keymap_entry keycode size (u32) instead of the device's
(void*) when validating that keycode value can be stored in the keymap.

Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=22722

Signed-off-by: Mattia Dongili <malattia@linux.it>
Tested-by: Norbert Preining <preining@logic.at>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 drivers/input/input.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Stefan Bader - Jan. 31, 2011, 9:09 a.m.
Seems to have been introduced by (2.6.37-rc1:

commit 8613e4c2872a87cc309a42de2c7091744dc54d0e
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date:   Thu Sep 9 21:54:22 2010 -0700

    Input: add support for large scancodes

though we got it through:

commit bcbfc24ead6935714a001ab6f1f725763075f98c
Author: Jarod Wilson <jarod@redhat.com>
Date:   Wed Aug 18 11:16:41 2010 -0600

    UBUNTU: SAUCE: Update ir-core to linuxtv/other which should be merged for
                    2.6.36

On 01/28/2011 07:55 PM, Tim Gardner wrote:
> The following changes since commit ae86ab8935c91281dac1ab943f0ca353bc68ed79:
>   Mattia Dongili (1):
>         Input: fix typo in keycode validation supporting large scancodes
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/rtg/ubuntu-maverick.git vaio-backlight-lp658198
> 
> 
> From ae86ab8935c91281dac1ab943f0ca353bc68ed79 Mon Sep 17 00:00:00 2001
> From: Mattia Dongili <malattia@linux.it>
> Date: Thu, 18 Nov 2010 09:06:43 -0800
> Subject: [PATCH] Input: fix typo in keycode validation supporting large scancodes
> 
> BugLink: http://bugs.launchpad.net/bugs/658198
> 
> Backported from de391d12500ede13faa7ecadbe900a8de1f76cfa
> by Tim Gardner <tim.gardner@canonical.com>
> 
> Check the input_keymap_entry keycode size (u32) instead of the device's
> (void*) when validating that keycode value can be stored in the keymap.
> 
> Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=22722
> 
> Signed-off-by: Mattia Dongili <malattia@linux.it>
> Tested-by: Norbert Preining <preining@logic.at>
> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  drivers/input/input.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/input/input.c b/drivers/input/input.c
> index e6395bf..577a40a 100644
> --- a/drivers/input/input.c
> +++ b/drivers/input/input.c
> @@ -681,7 +681,7 @@ static int input_default_setkeycode(struct input_dev *dev,
>  	if (!dev->keycodesize)
>  		return -EINVAL;
>  
> -	if (dev->keycodesize < sizeof(dev->keycode) &&
> +	if (dev->keycodesize < sizeof(kt_entry->keycode) &&
>  	    (kt_entry->keycode >> (dev->keycodesize * 8)))
>  		return -EINVAL;
>
Andy Whitcroft - Jan. 31, 2011, 9:49 a.m.
On Fri, Jan 28, 2011 at 11:55:02AM -0700, Tim Gardner wrote:
> The following changes since commit ae86ab8935c91281dac1ab943f0ca353bc68ed79:
>   Mattia Dongili (1):
>         Input: fix typo in keycode validation supporting large scancodes
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/rtg/ubuntu-maverick.git vaio-backlight-lp658198
> 
> 
> From ae86ab8935c91281dac1ab943f0ca353bc68ed79 Mon Sep 17 00:00:00 2001
> From: Mattia Dongili <malattia@linux.it>
> Date: Thu, 18 Nov 2010 09:06:43 -0800
> Subject: [PATCH] Input: fix typo in keycode validation supporting large scancodes
> 
> BugLink: http://bugs.launchpad.net/bugs/658198
> 
> Backported from de391d12500ede13faa7ecadbe900a8de1f76cfa
> by Tim Gardner <tim.gardner@canonical.com>
> 
> Check the input_keymap_entry keycode size (u32) instead of the device's
> (void*) when validating that keycode value can be stored in the keymap.
> 
> Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=22722
> 
> Signed-off-by: Mattia Dongili <malattia@linux.it>
> Tested-by: Norbert Preining <preining@logic.at>
> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  drivers/input/input.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/input/input.c b/drivers/input/input.c
> index e6395bf..577a40a 100644
> --- a/drivers/input/input.c
> +++ b/drivers/input/input.c
> @@ -681,7 +681,7 @@ static int input_default_setkeycode(struct input_dev *dev,
>  	if (!dev->keycodesize)
>  		return -EINVAL;
>  
> -	if (dev->keycodesize < sizeof(dev->keycode) &&
> +	if (dev->keycodesize < sizeof(kt_entry->keycode) &&
>  	    (kt_entry->keycode >> (dev->keycodesize * 8)))
>  		return -EINVAL;
>  

Looks good to me, matches upstream changes as well.

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw
Andy Whitcroft - Jan. 31, 2011, 9:51 a.m.
Applied to Maverick master-next.

-apw