usb: gadget: u_serial: Avoid double unlock of serial_port_lock
authorPrashanth K <prashanth.k@oss.qualcomm.com>
Tue, 6 May 2025 10:49:12 +0000 (16:19 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 May 2025 11:10:07 +0000 (13:10 +0200)
Avoid unlocking serial_port_lock twice in gserial_suspend(), this can
occur if gserial_wakeup_host() fails. And since wakeup is performed
outside spinlock, check if the port is valid before proceeding again.

Fixes: 3baea29dc0a7 ("usb: gadget: u_serial: Implement remote wakeup capability")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/all/aBHatifO5bjR1yPt@stanley.mountain/
Signed-off-by: Prashanth K <prashanth.k@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250506104912.3750934-1-prashanth.k@oss.qualcomm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/function/u_serial.c

index 41dee7c8cc7c3aaa49076a00300d76d7b0cfbc1f..ab544f6824befa3a90922e9f16c8255a1d9d9fa9 100644 (file)
@@ -1505,6 +1505,13 @@ void gserial_suspend(struct gserial *gser)
                spin_unlock_irqrestore(&serial_port_lock, flags);
                if (!gserial_wakeup_host(gser))
                        return;
+
+               /* Check if port is valid after acquiring lock back */
+               spin_lock_irqsave(&serial_port_lock, flags);
+               if (!port) {
+                       spin_unlock_irqrestore(&serial_port_lock, flags);
+                       return;
+               }
        }
 
        spin_lock(&port->port_lock);