diff options
| author | Colin Ian King <colin.king@canonical.com> | 2018-11-13 09:43:23 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-27 09:08:15 +0100 |
| commit | ee0a29ba574bde9861eee08d7b13a9cfbfcc8d1f (patch) | |
| tree | fbe76fa2fbb95f0f1f06fbc6c2cd0b36c12bc08f | |
| parent | d491324f966518fbd3f4c627a3e9766d018a4eef (diff) | |
| download | linux-ee0a29ba574bde9861eee08d7b13a9cfbfcc8d1f.tar.bz2 | |
serial-uartlite: fix null pointer dereference on pointer port
Pointer port is dereferenced on port->private_data when assigning pointer
pdata before port is null checked, leading to a potential null pointer
dereference. Fix this by assigning pdata after the null pointer check on
port.
Detected by CoverityScan, CID#1475434 ("Dereference before null check")
Fixes: 3b209d253e7f ("serial-uartlite: Do not use static struct uart_driver out of probe()")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/uartlite.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c index 4a7989df5ff5..b8b912b5a8b9 100644 --- a/drivers/tty/serial/uartlite.c +++ b/drivers/tty/serial/uartlite.c @@ -694,10 +694,11 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq, static int ulite_release(struct device *dev) { struct uart_port *port = dev_get_drvdata(dev); - struct uartlite_data *pdata = port->private_data; int rc = 0; if (port) { + struct uartlite_data *pdata = port->private_data; + rc = uart_remove_one_port(pdata->ulite_uart_driver, port); dev_set_drvdata(dev, NULL); port->mapbase = 0; @@ -715,10 +716,12 @@ static int ulite_release(struct device *dev) static int __maybe_unused ulite_suspend(struct device *dev) { struct uart_port *port = dev_get_drvdata(dev); - struct uartlite_data *pdata = port->private_data; - if (port) + if (port) { + struct uartlite_data *pdata = port->private_data; + uart_suspend_port(pdata->ulite_uart_driver, port); + } return 0; } @@ -732,10 +735,12 @@ static int __maybe_unused ulite_suspend(struct device *dev) static int __maybe_unused ulite_resume(struct device *dev) { struct uart_port *port = dev_get_drvdata(dev); - struct uartlite_data *pdata = port->private_data; - if (port) + if (port) { + struct uartlite_data *pdata = port->private_data; + uart_resume_port(pdata->ulite_uart_driver, port); + } return 0; } |