Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6409b825 authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

tty/serial: digicolor: fix possible null-ptr-deref in digicolor_uart_probe() 



commit 447ee1516f19f534a228dda237eddb202f23e163 upstream.

It will cause null-ptr-deref when using 'res', if platform_get_resource()
returns NULL, so move using 'res' after devm_ioremap_resource() that
will check it to avoid null-ptr-deref.
And use devm_platform_get_and_ioremap_resource() to simplify code.

Fixes: 5930cb35 ("serial: driver for Conexant Digicolor USART")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarBaruch Siach <baruch@tkos.co.il>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20220505124621.1592697-1-yangyingliang@huawei.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b8ef640

drivers/tty/serial/digicolor-usart.c

+1 −1
Original line number Diff line number Diff line
@@ -472,10 +472,10 @@ static int digicolor_uart_probe(struct platform_device *pdev) 
		return PTR_ERR(uart_clk);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	dp->port.mapbase = res->start;

	dp->port.membase = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(dp->port.membase))

		return PTR_ERR(dp->port.membase);

	dp->port.mapbase = res->start;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0)