lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 381/879] drm/rockchip: vop: fix possible null-ptr-deref in vop_bind()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit f8c242908ad15bbd604d3bcb54961b7d454c43f8 ]

    It will cause null-ptr-deref in resource_size(), if platform_get_resource()
    returns NULL, move calling resource_size() after devm_ioremap_resource() that
    will check 'res' to avoid null-ptr-deref.

    Fixes: 2048e3286f34 ("drm: rockchip: Add basic drm driver")
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Link: https://patchwork.freedesktop.org/patch/msgid/20220422032854.2995175-1-yangyingliang@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
    index 3e8d9e2d1b67..d53037531f40 100644
    --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
    +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
    @@ -2118,10 +2118,10 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
    vop_win_init(vop);

    res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    - vop->len = resource_size(res);
    vop->regs = devm_ioremap_resource(dev, res);
    if (IS_ERR(vop->regs))
    return PTR_ERR(vop->regs);
    + vop->len = resource_size(res);

    res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
    if (res) {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 00:43    [W:2.694 / U:0.876 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site