Re: [PATCH v2] serial: 8250: fix error handling in of_platform_serial_probe()

[Johan Hovold]

On Tue, Jul 18, 2017 at 02:32:11PM +0300, Alexey Khoroshilov wrote:
> clk_disable_unprepare(info->clk) is missed in of_platform_serial_probe(),
> while irq_dispose_mapping(port->irq) is missed in of_platform_serial_setup().
> 
> Found by Linux Driver Verification project (linuxtesting.org).
> 
> Signed-off-by: Alexey Khoroshilov <khoroshilov@xxxxxxxxx>

> @@ -167,7 +167,9 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
>  		port->handle_irq = fsl8250_handle_irq;
>  
>  	return 0;
> -out:
> +err_dispose:
> +	irq_dispose_mapping(port->irq);
> +err_unprepare:
>  	if (info->clk)
>  		clk_disable_unprepare(info->clk);
>  	return ret;

> @@ -217,15 +219,18 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
>  
>  	ret = serial8250_register_8250_port(&port8250);
>  	if (ret < 0)
> -		goto out;
> +		goto err_register;
>  
>  	info->type = port_type;
>  	info->line = ret;
>  	platform_set_drvdata(ofdev, info);
>  	return 0;
> -out:
> -	kfree(info);
> +err_register:
>  	irq_dispose_mapping(port8250.port.irq);
> +	if (info->clk)
> +		clk_disable_unprepare(info->clk);
> +err_setup:
> +	kfree(info);

Please name also these error labels after what they do rather than after
from where you jump to them (i.e. as you did above in
of_platform_serial_setup()).

Thanks,
Johan