lkml.org 
[lkml]   [2022]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 40/66] tty/serial: digicolor: fix possible null-ptr-deref in digicolor_uart_probe()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    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: 5930cb3511df ("serial: driver for Conexant Digicolor USART")
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Reviewed-by: Baruch 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/tty/serial/digicolor-usart.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    --- a/drivers/tty/serial/digicolor-usart.c
    +++ b/drivers/tty/serial/digicolor-usart.c
    @@ -471,11 +471,10 @@ static int digicolor_uart_probe(struct p
    if (IS_ERR(uart_clk))
    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);
    + dp->port.membase = devm_platform_get_and_ioremap_resource(pdev, 0, &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)

    \
     
     \ /
      Last update: 2022-05-16 22:10    [W:3.288 / U:0.752 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site