[PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.

[PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.

[Noriaki TAKAMIYA]

Hi,

  When I boot using linux-2.6.21-rc4 on ThinkPad T41 with pl2303 USB
  serial device plugged in, the kernel crashes.

  The reason is struct usb_serial_port is referenced without checking
  whether it is NULL or not.

  Regards,

--
Noriaki TAKAMIYA

[PATCH 1/2] [USB] [PL2303]: fixed to skip NULL entry in pl2303_shutdown.

[Noriaki TAKAMIYA]

Hi,

  While booting, this entry is set to NULL in destroy_serial(),
  but serial->port is referred again in pl2303_shutdown() via
  serial->type->shutdown.
---
 drivers/usb/serial/pl2303.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 83dfae9..d631f8c 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -905,6 +905,8 @@ static void pl2303_shutdown(struct usb_s
 	dbg("%s", __FUNCTION__);
 
 	for (i = 0; i < serial->num_ports; ++i) {
+		if (!serial->port[i])
+			continue;
 		priv = usb_get_serial_port_data(serial->port[i]);
 		if (priv) {
 			pl2303_buf_free(priv->buf);
-- 
1.4.4

--
Noriaki TAKAMIYA

[PATCH 2/2] [USB] [SERIAL]: fixed to skip NULL port entry in struct usb_serial_port.

[Noriaki TAKAMIYA]

Hi,

  This patch fixes to skip serial->port[i] if it is set NULL.
---
 include/linux/usb/serial.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 32acbae..85ed5ef 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -99,7 +99,10 @@ struct usb_serial_port {
 /* get and set the port private data pointer helper functions */
 static inline void *usb_get_serial_port_data (struct usb_serial_port *port)
 {
-	return dev_get_drvdata(&port->dev);
+	if (port)
+		return dev_get_drvdata(&port->dev);
+	else
+		return NULL;
 }
 
 static inline void usb_set_serial_port_data (struct usb_serial_port *port, void *data)
-- 
1.4.4

--
Noriaki TAKAMIYA

Re: (usagi-core 32633) [PATCH 1/2] [USB] [PL2303]: fixed to skip NULL entry in pl2303_shutdown.

[Noriaki TAKAMIYA]

Sorry for resending.

  While booting, this entry is set to NULL in destroy_serial(),
  but serial->port is referred again in pl2303_shutdown() via
  serial->type->shutdown.

Signed-off-by: Noriaki TAKAMIYA <takamiya@po.ntts.co.jp>

---
 drivers/usb/serial/pl2303.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 83dfae9..d631f8c 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -905,6 +905,8 @@ static void pl2303_shutdown(struct usb_s
 	dbg("%s", __FUNCTION__);
 
 	for (i = 0; i < serial->num_ports; ++i) {
+		if (!serial->port[i])
+			continue;
 		priv = usb_get_serial_port_data(serial->port[i]);
 		if (priv) {
 			pl2303_buf_free(priv->buf);
-- 
1.4.4

--
Noriaki TAKAMIYA

Re: (usagi-core 32634) [PATCH 2/2] [USB] [SERIAL]: fixed to skip NULL port entry in struct usb_serial_port.

[Noriaki TAKAMIYA]

Sorry for resending.

Hi,

  This patch fixes to skip serial->port[i] if it is set NULL.

Signed-off-by: Noriaki TAKAMIYA <takamiya@po.ntts.co.jp>

---
 include/linux/usb/serial.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 32acbae..85ed5ef 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -99,7 +99,10 @@ struct usb_serial_port {
 /* get and set the port private data pointer helper functions */
 static inline void *usb_get_serial_port_data (struct usb_serial_port *port)
 {
-	return dev_get_drvdata(&port->dev);
+	if (port)
+		return dev_get_drvdata(&port->dev);
+	else
+		return NULL;
 }
 
 static inline void usb_set_serial_port_data (struct usb_serial_port *port, void *data)
-- 
1.4.4

--
Noriaki TAKAMIYA

Re: (usagi-core 32633) [PATCH 1/2] [USB] [PL2303]: fixed to skip NULL entry in pl2303_shutdown.

[Noriaki TAKAMIYA]

Sorry for resending

Hi,

  While booting, this entry is set to NULL in destroy_serial(),
  but serial->port is referred again in pl2303_shutdown() via
  serial->type->shutdown.
---
 drivers/usb/serial/pl2303.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 83dfae9..d631f8c 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -905,6 +905,8 @@ static void pl2303_shutdown(struct usb_s
 	dbg("%s", __FUNCTION__);
 
 	for (i = 0; i < serial->num_ports; ++i) {
+		if (!serial->port[i])
+			continue;
 		priv = usb_get_serial_port_data(serial->port[i]);
 		if (priv) {
 			pl2303_buf_free(priv->buf);
-- 
1.4.4

--
Noriaki TAKAMIYA

Re: [linux-usb-devel] [PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.

[Greg KH]

On Sun, Mar 25, 2007 at 12:52:27AM +0900, Noriaki TAKAMIYA wrote:
> Hi,
> 
>   When I boot using linux-2.6.21-rc4 on ThinkPad T41 with pl2303 USB
>   serial device plugged in, the kernel crashes.
> 
>   The reason is struct usb_serial_port is referenced without checking
>   whether it is NULL or not.

This should already be fixed in the -git snapshots that have come out
after 2.6.21-rc4.  Can you test them to verify this?

thanks,

greg k-h

Re: (usagi-core 32638) Re: [linux-usb-devel] [PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.

[Noriaki TAKAMIYA]

Hi,

>> Sat, 24 Mar 2007 14:22:53 -0700
>> [Subject: (usagi-core 32638) Re: [linux-usb-devel] [PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.]
>> Greg KH <greg@kroah.com> wrote...

> This should already be fixed in the -git snapshots that have come out
> after 2.6.21-rc4.  Can you test them to verify this?

  Yes, this problem was already fixed.

  Thanks.

--
Noriaki TAKAMIYA

Re: (usagi-core 32638) Re: [linux-usb-devel] [PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.

[Greg KH]

On Sun, Mar 25, 2007 at 02:47:40PM +0900, Noriaki TAKAMIYA wrote:
> Hi,
> 
> >> Sat, 24 Mar 2007 14:22:53 -0700
> >> [Subject: (usagi-core 32638) Re: [linux-usb-devel] [PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.]
> >> Greg KH <greg@kroah.com> wrote...
> 
> > This should already be fixed in the -git snapshots that have come out
> > after 2.6.21-rc4.  Can you test them to verify this?
> 
>   Yes, this problem was already fixed.

Great, thanks for testing.  So I guess both of these patches are no
longer necessary, right?

thanks,

greg k-h

Re: (usagi-core 32640) Re: [linux-usb-devel] [PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.

[Noriaki TAKAMIYA]

Hi,

>> Sun, 25 Mar 2007 08:55:21 -0700
>> [Subject: (usagi-core 32640) Re: [linux-usb-devel] [PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.]
>> Greg KH <greg@kroah.com> wrote...

> >   Yes, this problem was already fixed.
> 
> Great, thanks for testing.  So I guess both of these patches are no
> longer necessary, right?

  I think so. But I wonder if usb_get_serial_port_data() should check
  the argument for the other drivers.

  Regards,

--
Noriaki TAKAMIYA

Re: (usagi-core 32640) Re: [linux-usb-devel] [PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.

[Greg KH]

On Mon, Mar 26, 2007 at 09:38:15AM +0900, Noriaki TAKAMIYA wrote:
> Hi,
> 
> >> Sun, 25 Mar 2007 08:55:21 -0700
> >> [Subject: (usagi-core 32640) Re: [linux-usb-devel] [PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.]
> >> Greg KH <greg@kroah.com> wrote...
> 
> > >   Yes, this problem was already fixed.
> > 
> > Great, thanks for testing.  So I guess both of these patches are no
> > longer necessary, right?
> 
>   I think so. But I wonder if usb_get_serial_port_data() should check
>   the argument for the other drivers.

I don't think it is really necessary, do you?

thanks,

greg k-h

Re: (usagi-core 32652) Re: [linux-usb-devel] [PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.

[Noriaki TAKAMIYA]

>> Tue, 27 Mar 2007 15:51:39 -0700
>> [Subject: (usagi-core 32652) Re: [linux-usb-devel] [PATCH 0/2] [SERIAL] [USB] fixed to skip NULL entry in struct serial usb_serial_port.]
>> Greg KH <greg@kroah.com> wrote...

> >   I think so. But I wonder if usb_get_serial_port_data() should check
> >   the argument for the other drivers.
> 
> I don't think it is really necessary, do you?

  I see.

--
Noriaki TAKAMIYA