[PATCH1/1] hso modem detect fix patch against Alan Cox'es tty tree

[PATCH1/1] hso modem detect fix patch against Alan Cox'es tty tree

[Denis Joseph Barrow]

[-- Attachment #1: Type: text/plain, Size: 1152 bytes --]

Here you go good sir,

Fixed incorrect check for the modem port, this prevents
crashes caused by issueing a tiocmget_submit_urb
on endpoints which don't exist for non modem devices. 
Signed-off-by: Denis Joseph Barrow <D.Barow-x9gZzRpC1QbQT0dZR+AlfA@public.gmane.org>
---
Index: linux-2.6.28-rc7.alan/drivers/net/usb/hso.c
===================================================================
--- linux-2.6.28-rc7.alan.orig/drivers/net/usb/hso.c	2008-12-08 15:26:00.000000000 +0100
+++ linux-2.6.28-rc7.alan/drivers/net/usb/hso.c	2008-12-08 15:28:10.000000000 +0100
@@ -2659,7 +2659,7 @@
 	serial->parent = hso_dev;
 	hso_dev->port_data.dev_serial = serial;
 
-	if (port & HSO_PORT_MODEM) {
+	if ((port & HSO_PORT_MASK) == HSO_PORT_MODEM) {
 		num_urbs = 2;
 		serial->tiocmget = kzalloc(sizeof(struct hso_tiocmget),
 					   GFP_KERNEL);



-- 
best regards,
D.J. Barrow

Linux Kernel Developer
Option NV, Gaston Geenslaan 14, 3001 Leuven, Belgium
 
T: +32 16 311 621
F: +32 16 207 164
M: +32 4xx xxx xxx
d.barow-x9gZzRpC1QbQT0dZR+AlfA@public.gmane.org
www.option.com

Disclaimer:
http://www.option.com/company/disclaimer.shtml
 RPR Leuven 0429.375.448

[-- Attachment #2: tty-hso-modem.fix.patch --]
[-- Type: text/x-diff, Size: 814 bytes --]

Fixed incorrect check for the modem port, this prevents
crashes caused by issueing a tiocmget_submit_urb
on endpoints which don't exist for non modem devices. 
Signed-off-by: Denis Joseph Barrow <D.Barow-x9gZzRpC1QbQT0dZR+AlfA@public.gmane.org>
---
Index: linux-2.6.28-rc7.alan/drivers/net/usb/hso.c
===================================================================
--- linux-2.6.28-rc7.alan.orig/drivers/net/usb/hso.c	2008-12-08 15:26:00.000000000 +0100
+++ linux-2.6.28-rc7.alan/drivers/net/usb/hso.c	2008-12-08 15:28:10.000000000 +0100
@@ -2659,7 +2659,7 @@
 	serial->parent = hso_dev;
 	hso_dev->port_data.dev_serial = serial;
 
-	if (port & HSO_PORT_MODEM) {
+	if ((port & HSO_PORT_MASK) == HSO_PORT_MODEM) {
 		num_urbs = 2;
 		serial->tiocmget = kzalloc(sizeof(struct hso_tiocmget),
 					   GFP_KERNEL);

Re: [PATCH1/1] hso modem detect fix patch against Alan Cox'es tty tree

[David Miller]

From: Denis Joseph Barrow <D.Barow@option.com>
Date: Mon, 08 Dec 2008 15:38:31 +0100

> Fixed incorrect check for the modem port, this prevents
> crashes caused by issueing a tiocmget_submit_urb
> on endpoints which don't exist for non modem devices. 
>
> Signed-off-by: Denis Joseph Barrow <D.Barow@option.com>

Alan, you got this one or want me to grab it?

I'm fine either way.