* [PATCH] tty: 8250: fix a missing check for pci_ioremap_bar
@ 2019-03-15 4:56 Kangjie Lu
2019-03-15 5:43 ` Jiri Slaby
0 siblings, 1 reply; 2+ messages in thread
From: Kangjie Lu @ 2019-03-15 4:56 UTC (permalink / raw)
To: kjlu; +Cc: pakki001, Greg Kroah-Hartman, Jiri Slaby, linux-serial, linux-kernel
pci_ioremap_bar could fail. The fix captures the failure and
pass an error code upstream. This can avoid potential NULL
pointer dereferences in the future.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
---
drivers/tty/serial/8250/8250_lpss.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_lpss.c b/drivers/tty/serial/8250/8250_lpss.c
index 98dbc796353f..e95332d8b35e 100644
--- a/drivers/tty/serial/8250/8250_lpss.c
+++ b/drivers/tty/serial/8250/8250_lpss.c
@@ -162,7 +162,7 @@ static const struct dw_dma_platform_data qrk_serial_dma_pdata = {
.multi_block = {0},
};
-static void qrk_serial_setup_dma(struct lpss8250 *lpss, struct uart_port *port)
+static int qrk_serial_setup_dma(struct lpss8250 *lpss, struct uart_port *port)
{
struct uart_8250_dma *dma = &lpss->dma;
struct dw_dma_chip *chip = &lpss->dma_chip;
@@ -173,12 +173,14 @@ static void qrk_serial_setup_dma(struct lpss8250 *lpss, struct uart_port *port)
chip->dev = &pdev->dev;
chip->irq = pci_irq_vector(pdev, 0);
chip->regs = pci_ioremap_bar(pdev, 1);
+ if (!chip->regs)
+ return -EIO;
chip->pdata = &qrk_serial_dma_pdata;
/* Falling back to PIO mode if DMA probing fails */
ret = dw_dma_probe(chip);
if (ret)
- return;
+ return ret;
pci_try_set_mwi(pdev);
@@ -192,6 +194,8 @@ static void qrk_serial_setup_dma(struct lpss8250 *lpss, struct uart_port *port)
param->hs_polarity = true;
lpss->dma_maxburst = 8;
+
+ return 0;
}
static void qrk_serial_exit_dma(struct lpss8250 *lpss)
@@ -203,7 +207,7 @@ static void qrk_serial_exit_dma(struct lpss8250 *lpss)
dw_dma_remove(&lpss->dma_chip);
}
#else /* CONFIG_SERIAL_8250_DMA */
-static void qrk_serial_setup_dma(struct lpss8250 *lpss, struct uart_port *port) {}
+static int qrk_serial_setup_dma(struct lpss8250 *lpss, struct uart_port *port) {}
static void qrk_serial_exit_dma(struct lpss8250 *lpss) {}
#endif /* !CONFIG_SERIAL_8250_DMA */
@@ -220,8 +224,7 @@ static int qrk_serial_setup(struct lpss8250 *lpss, struct uart_port *port)
port->irq = pci_irq_vector(pdev, 0);
- qrk_serial_setup_dma(lpss, port);
- return 0;
+ return qrk_serial_setup_dma(lpss, port);
}
static void qrk_serial_exit(struct lpss8250 *lpss)
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tty: 8250: fix a missing check for pci_ioremap_bar
2019-03-15 4:56 [PATCH] tty: 8250: fix a missing check for pci_ioremap_bar Kangjie Lu
@ 2019-03-15 5:43 ` Jiri Slaby
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Slaby @ 2019-03-15 5:43 UTC (permalink / raw)
To: Kangjie Lu; +Cc: Greg Kroah-Hartman, pakki001, linux-kernel, linux-serial
On 15. 03. 19, 5:56, Kangjie Lu wrote:
> pci_ioremap_bar could fail. The fix captures the failure and
> pass an error code upstream. This can avoid potential NULL
> pointer dereferences in the future.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
> drivers/tty/serial/8250/8250_lpss.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250_lpss.c b/drivers/tty/serial/8250/8250_lpss.c
> index 98dbc796353f..e95332d8b35e 100644
> --- a/drivers/tty/serial/8250/8250_lpss.c
> +++ b/drivers/tty/serial/8250/8250_lpss.c
...
> @@ -203,7 +207,7 @@ static void qrk_serial_exit_dma(struct lpss8250 *lpss)
> dw_dma_remove(&lpss->dma_chip);
> }
> #else /* CONFIG_SERIAL_8250_DMA */
> -static void qrk_serial_setup_dma(struct lpss8250 *lpss, struct uart_port *port) {}
> +static int qrk_serial_setup_dma(struct lpss8250 *lpss, struct uart_port *port) {}
So you have to return something here now.
> static void qrk_serial_exit_dma(struct lpss8250 *lpss) {}
> #endif /* !CONFIG_SERIAL_8250_DMA */
>
regards,
--
js
suse labs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-15 5:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-15 4:56 [PATCH] tty: 8250: fix a missing check for pci_ioremap_bar Kangjie Lu
2019-03-15 5:43 ` Jiri Slaby
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.