Skip to contentSkip to conversation

usb: gadget: u_serial: Fix possible null pointer dereference

PATCH In review Florian Faber 2 participants 3 messages Sep 19, 2021 – Sep 20, 2021 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: gadget: u_serial: Fix possible null pointer dereference

In gs_rx_push, tty can be null. tty_throttled accesses tty->flags without further testing, which would lead to a null pointer dereference.

---
 drivers/usb/gadget/function/u_serial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/function/u_serial.c +1 -1
index 6f68cbeeee7c..00512e7c7261 100644
@@ -436,7 +436,7 @@ static void gs_rx_push(struct work_struct *work)
 	 * We may leave non-empty queue only when there is a tty, and
 	 * either it is throttled or there is no more room in flip buffer.
 	 */
-	if (!list_empty(queue) && !tty_throttled(tty))
+	if (tty && !list_empty(queue) && !tty_throttled(tty))
 		schedule_delayed_work(&port->push, 1);
 
 	/* If we're still connected, refill the USB RX queue. */
maintainer
#1 lore raw
Quoted 1 line · Florian Faber

In gs_rx_push, tty can be null. tty_throttled accesses tty->flags without further testing, which would lead to a null pointer dereference.

Please wrap your changelog text to 72 columns.

Quoted 11 lines
---
 drivers/usb/gadget/function/u_serial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/function/u_serial.c +0 -0
index 6f68cbeeee7c..00512e7c7261 100644

drivers/usb/gadget/function/u_serial.c static void gs_rx_push(struct work_struct *work) · line 439

Quoted 5 lines
drivers/usb/gadget/function/u_serial.c +1 -1
@@ -436,7 +436,7 @@ static void gs_rx_push(struct work_struct *work)
 	 * We may leave non-empty queue only when there is a tty, and
 	 * either it is throttled or there is no more room in flip buffer.
 	 */
-	if (!list_empty(queue) && !tty_throttled(tty))
+	if (tty && !list_empty(queue) && !tty_throttled(tty))

Have you ever been able to trigger this with a NULL tty?

thanks,

greg k-h

#2 lore raw

Greg,

Quoted 11 lines · Greg KH
Quoted 1 line · Florian Faber

In gs_rx_push, tty can be null. tty_throttled accesses tty->flags without further testing, which would lead to a null pointer dereference.

Please wrap your changelog text to 72 columns.

Quoted 6 lines
---
  drivers/usb/gadget/function/u_serial.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 12 lines

drivers/usb/gadget/function/u_serial.c static void gs_rx_push(struct work_struct *work) · line 439

Quoted 10 lines
drivers/usb/gadget/function/u_serial.c +1 -1
index 6f68cbeeee7c..00512e7c7261 100644
@@ -436,7 +436,7 @@ static void gs_rx_push(struct work_struct *work)
  	 * We may leave non-empty queue only when there is a tty, and
  	 * either it is throttled or there is no more room in flip buffer.
  	 */
-	if (!list_empty(queue) && !tty_throttled(tty))
+	if (tty && !list_empty(queue) && !tty_throttled(tty))

Have you ever been able to trigger this with a NULL tty?

No, not practical. I've just stumbled across it.

70 lines above it is checked in the same way:

--------------------------snip------------------------------

		/* leave data queued if tty was rx throttled */
		if (tty && tty_throttled(tty))

--------------------------snip------------------------------

..and 50 lines above:

--------------------------snip------------------------------

		/* push data to (open) tty */
		if (req->actual && tty) {

--------------------------snip------------------------------

The check makes sense since tty CAN be null (depending on the local connection) and it doesn't change its value after the first assignment.

Flo

Signature · 1 line
Machines can do the work, so people have time to think.