Skip to contentSkip to conversation

irtty-sir.c: Do not set_termios() on irtty_close()

PATCH Applied Tommie Gannert 3 participants 5 messages Feb 13, 2014 – Feb 17, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 irtty-sir.c: Do not set_termios() on irtty_close()

From: Tommie Gannert <[email protected]>

Issuing set_termios() from irtty_close() causes kernel Oops for unplugged usb-serial devices.

Since no other tty_ldisc calls set_termios() on close and no tty driver seem to check if tty->device_data is NULL or not on entry to set_termios(), the only solution I can come up with is to remove the irtty_stop_receiver() call, which only updates termios.

---
I know very little of this code, and I'm not sure this is a good solution, so here's some background:

I have a gadget using IrLAP over RS-232, and it's connected to a USB-RS232 converter. I have udev rules to start/stop irattach on USB connect/disconnect, but I see an oops if I simply disconnect the device while irattach is still running:

Crash log:

[  631.791294] BUG: unable to handle kernel NULL pointer dereference at 0000000000000024
[  631.791390] IP: [<ffffffffa0c07e42>] ftdi_set_termios+0x42/0x670 [ftdi_sio]
...
[  631.793963]  [<ffffffffa0b7fba3>] serial_set_termios+0x43/0x90 [usbserial]
[  631.794031]  [<ffffffffa0c013ec>] irtty_close+0x10c/0x190 [irtty_sir]
[  631.794096]  [<ffffffff81356e88>] tty_ldisc_close.isra.1+0x38/0x50
[  631.794157]  [<ffffffff81356eb8>] tty_ldisc_kill+0x18/0x90
[  631.794209]  [<ffffffff81357894>] tty_ldisc_release+0x34/0x90
[  631.794266]  [<ffffffff8134fe00>] tty_release+0x470/0x600

There is a comment in irtty_close() speculating about potential problems with usb-serial. I'm not sure if that comment belongs to sirdev_put_instance() or the irtty_stop_receiver() call. I would guess both, so I let it be.

The effect of this is that /dev/ttyUSB* is still in use, and thus leaking at least dev nodes. This is a minimal patch that solves that oops.

drivers/net/irda/irtty-sir.c renamed from drivers/net/irda/irtty-sir.c.orig +0 -1
@@ -521,7 +521,6 @@ static void irtty_close(struct tty_struc
 	sirdev_put_instance(priv->dev);
 
 	/* Stop tty */
-	irtty_stop_receiver(tty, TRUE);
 	clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
 	if (tty->ops->stop)
 		tty->ops->stop(tty);
maintainer
#1 lore raw

From: Tommie Gannert <[email protected]>
Date: Thu, 13 Feb 2014 08:52:06 +0000

drivers/net/irda/irtty-sir.c 2014-02-12 static void irtty_close(struct tty_struc · line 525

Quoted 11 lines

--- linux-3.12/drivers/net/irda/irtty-sir.c.orig 2014-02-12

drivers/net/irda/irtty-sir.c 2014-02-12 renamed from 21:36:46.132496089 +0000 +0 -0

21:57:21.635843884 +0000

drivers/net/irda/irtty-sir.c 2014-02-12 renamed from 21:36:46.132496089 +0000 +0 -1
@@ -521,7 +521,6 @@ static void irtty_close(struct tty_struc
 	sirdev_put_instance(priv->dev);
   	/* Stop tty */
-	irtty_stop_receiver(tty, TRUE);
 	clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
 	if (tty->ops->stop)
 		tty->ops->stop(tty);

This patch has been corrupted by your email client. Please fix this up and resubmit, thanks.

#2 lore raw
In reply to Tommie Gannert

From: Tommie Gannert <[email protected]>

Issuing set_termios() from irtty_close() causes kernel Oops for unplugged usb-serial devices.

Since no other tty_ldisc calls set_termios() on close and no tty driver seem to check if tty->device_data is NULL or not on entry to set_termios(), the only solution I can come up with is to remove the irtty_stop_receiver() call, which only updates termios.

---
v2: Resend due to mail format issues. More Thunderbird settings applied.

I know very little of this code, and I'm not sure this is a good solution, so here's some background:

I have a gadget using IrLAP over RS-232, and it's connected to a USB-RS232 converter. I have udev rules to start/stop irattach on USB connect/disconnect, but I see an oops if I simply disconnect the device while irattach is still running:

Crash log:

[  631.791294] BUG: unable to handle kernel NULL pointer dereference at 0000000000000024
[  631.791390] IP: [<ffffffffa0c07e42>] ftdi_set_termios+0x42/0x670 [ftdi_sio]
...
[  631.793963]  [<ffffffffa0b7fba3>] serial_set_termios+0x43/0x90 [usbserial]
[  631.794031]  [<ffffffffa0c013ec>] irtty_close+0x10c/0x190 [irtty_sir]
[  631.794096]  [<ffffffff81356e88>] tty_ldisc_close.isra.1+0x38/0x50
[  631.794157]  [<ffffffff81356eb8>] tty_ldisc_kill+0x18/0x90
[  631.794209]  [<ffffffff81357894>] tty_ldisc_release+0x34/0x90
[  631.794266]  [<ffffffff8134fe00>] tty_release+0x470/0x600

There is a comment in irtty_close() speculating about potential problems with usb-serial. I'm not sure if that comment belongs to sirdev_put_instance() or the irtty_stop_receiver() call. I would guess both, so I let it be.

The effect of this is that /dev/ttyUSB* is still in use, and thus leaking at least dev nodes. This is a minimal patch that solves that oops.

drivers/net/irda/irtty-sir.c renamed from drivers/net/irda/irtty-sir.c.orig +0 -1
@@ -521,7 +521,6 @@ static void irtty_close(struct tty_struc
 	sirdev_put_instance(priv->dev);
 
 	/* Stop tty */
-	irtty_stop_receiver(tty, TRUE);
 	clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
 	if (tty->ops->stop)
 		tty->ops->stop(tty);
maintainer Applied
#3 lore raw

From: Tommie Gannert <[email protected]>
Date: Mon, 17 Feb 2014 20:46:04 +0000

Quoted 11 lines

From: Tommie Gannert <[email protected]>

Issuing set_termios() from irtty_close() causes kernel Oops for unplugged usb-serial devices.

Since no other tty_ldisc calls set_termios() on close and no tty driver seem to check if tty->device_data is NULL or not on entry to set_termios(), the only solution I can come up with is to remove the irtty_stop_receiver() call, which only updates termios.

Applied, thank you.

#4 lore raw
In reply to Tommie Gannert
Quoted 4 lines

v2: Resend due to mail format issues. More Thunderbird settings applied.

I know very little of this code, and I'm not sure this is a good solution, so here's some background:

I wouldn't worry too much. I'm amazed the code even works these days. It's incredibly bitrotted and doesn't use the tty layer properly (mind you it never did)

drivers/net/irda/irtty-sir.c static void irtty_close(struct tty_struc · line 526

Quoted 12 lines

The effect of this is that /dev/ttyUSB* is still in use, and thus leaking at least dev nodes. This is a minimal patch that solves that oops.

drivers/net/irda/irtty-sir.c renamed from drivers/net/irda/irtty-sir.c.orig +0 -1
@@ -521,7 +521,6 @@ static void irtty_close(struct tty_struc
 	sirdev_put_instance(priv->dev);
 
 	/* Stop tty */
-	irtty_stop_receiver(tty, TRUE);
 	clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
 	if (tty->ops->stop)
 		tty->ops->stop(tty);

This change looks correct to me. The three lines below your change are amusing all incorrect and should probably also all be deleted.

Alan