2005-12-17 02:31:09

by Dmitry Torokhov

[permalink] [raw]
Subject: [PATCH] Input: fix an OOPS in HID driver

Subject:

This patch fixes an OOPS in HID driver when connecting simulation
devices generating unknown simulation events.

Signed-off-by: Dmitry Torokhov <[email protected]>
---

drivers/usb/input/hid-input.c | 1 +
1 files changed, 1 insertion(+)

Index: work/drivers/usb/input/hid-input.c
===================================================================
--- work.orig/drivers/usb/input/hid-input.c
+++ work/drivers/usb/input/hid-input.c
@@ -137,6 +137,7 @@ static void hidinput_configure_usage(str
switch (usage->hid & 0xffff) {
case 0xba: map_abs(ABS_RUDDER); break;
case 0xbb: map_abs(ABS_THROTTLE); break;
+ default: goto unknown;
}
break;


2005-12-17 10:22:26

by Vojtech Pavlik

[permalink] [raw]
Subject: Re: [PATCH] Input: fix an OOPS in HID driver

On Fri, Dec 16, 2005 at 09:31:04PM -0500, Dmitry Torokhov wrote:
> Subject:
>
> This patch fixes an OOPS in HID driver when connecting simulation
> devices generating unknown simulation events.
>
> Signed-off-by: Dmitry Torokhov <[email protected]>

Yup, needed indeed. I'm not sure if we want an 'unknown': 'ignore'
might be safer.

> ---
>
> drivers/usb/input/hid-input.c | 1 +
> 1 files changed, 1 insertion(+)
>
> Index: work/drivers/usb/input/hid-input.c
> ===================================================================
> --- work.orig/drivers/usb/input/hid-input.c
> +++ work/drivers/usb/input/hid-input.c
> @@ -137,6 +137,7 @@ static void hidinput_configure_usage(str
> switch (usage->hid & 0xffff) {
> case 0xba: map_abs(ABS_RUDDER); break;
> case 0xbb: map_abs(ABS_THROTTLE); break;
> + default: goto unknown;
> }
> break;
>
>
>

--
Vojtech Pavlik
SuSE Labs, SuSE CR

2005-12-17 16:43:05

by Dmitry Torokhov

[permalink] [raw]
Subject: Re: [PATCH] Input: fix an OOPS in HID driver

On Saturday 17 December 2005 05:22, Vojtech Pavlik wrote:
> On Fri, Dec 16, 2005 at 09:31:04PM -0500, Dmitry Torokhov wrote:
> > Subject:
> >
> > This patch fixes an OOPS in HID driver when connecting simulation
> > devices generating unknown simulation events.
> >
> > Signed-off-by: Dmitry Torokhov <[email protected]>
>
> Yup, needed indeed. I'm not sure if we want an 'unknown': 'ignore'
> might be safer.

Well, 'unknown' restores the previous behavior (before simulation codes
were added to the driver) so it is pretty safe, however 'ignore' is indeed
more correct I think.

I will send an updated patch. Linus, if you already applied the original
one just ignore the new one - we can change it post 2.6.15 when we add
more simulation codes to HID driver.

--
Dmitry

2005-12-17 16:43:03

by Dmitry Torokhov

[permalink] [raw]
Subject: [PATCH] Input: fix an OOPS in HID driver

This patch fixes an OOPS in HID driver when connecting simulation
devices generating unknown simulation events.

Signed-off-by: Dmitry Torokhov <[email protected]>
Acked-by: Vojtech Pavlik <[email protected]>
---

drivers/usb/input/hid-input.c | 1 +
1 files changed, 1 insertion(+)

Index: work/drivers/usb/input/hid-input.c
===================================================================
--- work.orig/drivers/usb/input/hid-input.c
+++ work/drivers/usb/input/hid-input.c
@@ -137,6 +137,7 @@ static void hidinput_configure_usage(str
switch (usage->hid & 0xffff) {
case 0xba: map_abs(ABS_RUDDER); break;
case 0xbb: map_abs(ABS_THROTTLE); break;
+ default: goto ignore;
}
break;

2005-12-22 00:15:04

by Adrian Bunk

[permalink] [raw]
Subject: Re: [PATCH] Input: fix an OOPS in HID driver

On Sat, Dec 17, 2005 at 11:42:54AM -0500, Dmitry Torokhov wrote:

> This patch fixes an OOPS in HID driver when connecting simulation
> devices generating unknown simulation events.
>...

This patch now went into Linus' tree.

It seems this patch should also go into 2.6.14.5?
If you agree, please submit it to [email protected] .

TIA
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2005-12-22 04:08:48

by Dmitry Torokhov

[permalink] [raw]
Subject: Re: [PATCH] Input: fix an OOPS in HID driver

On Wednesday 21 December 2005 19:15, Adrian Bunk wrote:
> On Sat, Dec 17, 2005 at 11:42:54AM -0500, Dmitry Torokhov wrote:
>
> > This patch fixes an OOPS in HID driver when connecting simulation
> > devices generating unknown simulation events.
> >...
>
> This patch now went into Linus' tree.
>
> It seems this patch should also go into 2.6.14.5?
> If you agree, please submit it to [email protected] .
>

Yes, you are right, I will send it there in a minute.

--
Dmitry