[PATCH] serial: ns16550_pci: fix possible read of uninitialized variable

[PATCH] serial: ns16550_pci: fix possible read of uninitialized variable

[Ahmad Fatoum]

When quirk->init is NULL, we evaluate an uninitialized rc.
Is we have already checked for rc < 0 at the point of assignment,
this if clause isn't needed. Remove it.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 drivers/serial/serial_ns16550_pci.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/serial/serial_ns16550_pci.c b/drivers/serial/serial_ns16550_pci.c
index d4b5bd8898b7..392a2810d815 100644
--- a/drivers/serial/serial_ns16550_pci.c
+++ b/drivers/serial/serial_ns16550_pci.c
@@ -3655,12 +3655,6 @@ pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board)
 	uart.pdata = xzalloc(sizeof(*uart.pdata));
 	uart.pdata->clock = board->base_baud * 16;
 
-	if (rc < 0) {
-		kfree(priv);
-		priv = ERR_PTR(rc);
-		goto err_deinit;
-	}
-
 	for (i = 0; i < nr_ports; i++) {
 		struct device_d *ns16550_dev;
 		struct resource *res;
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] serial: ns16550_pci: fix possible read of uninitialized variable

[Sascha Hauer]

On Wed, Feb 12, 2020 at 10:38:39AM +0100, Ahmad Fatoum wrote:
> When quirk->init is NULL, we evaluate an uninitialized rc.
> Is we have already checked for rc < 0 at the point of assignment,
> this if clause isn't needed. Remove it.
> 
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> ---
>  drivers/serial/serial_ns16550_pci.c | 6 ------
>  1 file changed, 6 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/serial/serial_ns16550_pci.c b/drivers/serial/serial_ns16550_pci.c
> index d4b5bd8898b7..392a2810d815 100644
> --- a/drivers/serial/serial_ns16550_pci.c
> +++ b/drivers/serial/serial_ns16550_pci.c
> @@ -3655,12 +3655,6 @@ pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board)
>  	uart.pdata = xzalloc(sizeof(*uart.pdata));
>  	uart.pdata->clock = board->base_baud * 16;
>  
> -	if (rc < 0) {
> -		kfree(priv);
> -		priv = ERR_PTR(rc);
> -		goto err_deinit;
> -	}
> -
>  	for (i = 0; i < nr_ports; i++) {
>  		struct device_d *ns16550_dev;
>  		struct resource *res;
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox