Re: [PATCH] fix hso soft-lockup

From: Greg KH
Date: Mon Oct 26 2009 - 13:18:51 EST


On Thu, Oct 22, 2009 at 11:36:18AM +0300, Antti Kaijanmäki wrote:
> Fix soft-lockup in hso.c which is triggered on SMP machine when
> modem is removed while file descriptor(s) under /dev are still open:
>
> old version called kref_put() too early which resulted in destroying
> hso_serial and hso_device objects which were still used later on.
>
> Also fix driver debug routines (not compiled in by default).

Patches need to have a "signed-off-by:" line in order to be applied.

Also, please do not gpg sign your patches, that only causes problems
with our tools.

> ---
> drivers/net/usb/hso.c | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
> index fa4e581..539642a 100644
> --- a/drivers/net/usb/hso.c
> +++ b/drivers/net/usb/hso.c
> @@ -2,6 +2,7 @@
> *
> * Driver for Option High Speed Mobile Devices.
> *
> + * Copyright (C) 2009 Antti Kaijanmäki <antti.kaijanmaki@xxxxxxxxxxx>

Adding a copyright for a few lines changed is not really correct.

> * Copyright (C) 2008 Option International
> * Filip Aben <f.aben@xxxxxxxxxx>
> * Denis Joseph Barrow <d.barow@xxxxxxxxxx>
> @@ -378,7 +379,7 @@ static void dbg_dump(int line_count, const char *func_name, unsigned char *buf,
> }
>
> #define DUMP(buf_, len_) \
> - dbg_dump(__LINE__, __func__, buf_, len_)
> + dbg_dump(__LINE__, __func__, (unsigned char*)buf_, len_)

Why did you mane this change?

>
> #define DUMP1(buf_, len_) \
> do { \
> @@ -1363,7 +1364,7 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
> /* reset the rts and dtr */
> /* do the actual close */
> serial->open_count--;
> - kref_put(&serial->parent->ref, hso_serial_ref_free);
> +
> if (serial->open_count <= 0) {
> serial->open_count = 0;
> spin_lock_irq(&serial->serial_lock);
> @@ -1383,6 +1384,8 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
> usb_autopm_put_interface(serial->parent->interface);
>
> mutex_unlock(&serial->parent->mutex);
> +
> + kref_put(&serial->parent->ref, hso_serial_ref_free);
> }
>
> /* close the requested serial port */
> @@ -1527,7 +1530,7 @@ static void tiocmget_intr_callback(struct urb *urb)
> dev_warn(&usb->dev,
> "hso received invalid serial state notification\n");
> DUMP(serial_state_notification,
> - sizeof(hso_serial_state_notifation))
> + sizeof(struct hso_serial_state_notification));

Is this a build fix not related to the bug above?

Also, network patches need to be sent to the network maintainers, they
usually miss them if you only copy the linux-kernel list.

Try using the scripts/get_maintainer.pl script on your patch to figure
out who to send the patch to, and also the scripts/checkpatch.pl script
to verify that you got everything correct before you send it off.

Also, for a bugfix like this, it would be good to send it to the
stable@xxxxxxxxxx developers when it goes into Linus's tree as others
are reporting problems with this driver in the 2.6.31 kernel.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/