[PATCH v2] usb: gadget: u_serial: Add null pointer check in gserial_resume

[Prashanth K <quic_prashk@xxxxxxxxxxx>]

Consider a case where gserial_disconnect has already cleared
gser->ioport. And if a wakeup interrupt triggers afterwards,
gserial_resume gets called, which will lead to accessing of
gser->ioport and thus causing null pointer dereference.Add
a null pointer check to prevent this.

Added a static spinlock to prevent gser->ioport from becoming
null after the newly added check.

Fixes: aba3a8d01d62 ("usb: gadget: u_serial: add suspend resume callbacks")
Signed-off-by: Prashanth K <quic_prashk@xxxxxxxxxxx>
---
v2: Added static spinlock and fixed Fixes tag.

 drivers/usb/gadget/function/u_serial.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
index 840626e..9ced0fa 100644
--- a/drivers/usb/gadget/function/u_serial.c
+++ b/drivers/usb/gadget/function/u_serial.c
@@ -82,6 +82,8 @@
 #define WRITE_BUF_SIZE		8192		/* TX only */
 #define GS_CONSOLE_BUF_SIZE	8192
 
+static DEFINE_SPINLOCK(serial_port_lock);
+
 /* console info */
 struct gs_console {
 	struct console		console;
@@ -1370,11 +1372,13 @@ EXPORT_SYMBOL_GPL(gserial_connect);
 void gserial_disconnect(struct gserial *gser)
 {
 	struct gs_port	*port = gser->ioport;
-	unsigned long	flags;
+	unsigned long flags, serial_flag;
 
 	if (!port)
 		return;
 
+	spin_lock_irqsave(&serial_port_lock, serial_flag);
+
 	/* tell the TTY glue not to do I/O here any more */
 	spin_lock_irqsave(&port->port_lock, flags);
 
@@ -1392,6 +1396,7 @@ void gserial_disconnect(struct gserial *gser)
 	}
 	port->suspended = false;
 	spin_unlock_irqrestore(&port->port_lock, flags);
+	spin_unlock_irqrestore(&serial_port_lock, serial_flag);
 
 	/* disable endpoints, aborting down any active I/O */
 	usb_ep_disable(gser->out);
@@ -1426,9 +1431,16 @@ EXPORT_SYMBOL_GPL(gserial_suspend);
 void gserial_resume(struct gserial *gser)
 {
 	struct gs_port *port = gser->ioport;
-	unsigned long	flags;
+	unsigned long flags, serial_flag;
+
+	spin_lock_irqsave(&serial_port_lock, serial_flag);
+	if (!port) {
+		spin_unlock_irqrestore(&serial_port_lock, serial_flag);
+		return;
+	}
 
 	spin_lock_irqsave(&port->port_lock, flags);
+	spin_unlock_irqrestore(&serial_port_lock, serial_flag);
 	port->suspended = false;
 	if (!port->start_delayed) {
 		spin_unlock_irqrestore(&port->port_lock, flags);
-- 
2.7.4