lkml.org 
[lkml]   [2019]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 016/158] media: vpss: fix a potential NULL pointer dereference
    Date
    From: Kangjie Lu <kjlu@umn.edu>

    [ Upstream commit e08f0761234def47961d3252eac09ccedfe4c6a0 ]

    In case ioremap fails, the fix returns -ENOMEM to avoid NULL
    pointer dereference.

    Signed-off-by: Kangjie Lu <kjlu@umn.edu>
    Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/davinci/vpss.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
    index 19cf6853411e..89a86c19579b 100644
    --- a/drivers/media/platform/davinci/vpss.c
    +++ b/drivers/media/platform/davinci/vpss.c
    @@ -518,6 +518,11 @@ static int __init vpss_init(void)
    return -EBUSY;

    oper_cfg.vpss_regs_base2 = ioremap(VPSS_CLK_CTRL, 4);
    + if (unlikely(!oper_cfg.vpss_regs_base2)) {
    + release_mem_region(VPSS_CLK_CTRL, 4);
    + return -ENOMEM;
    + }
    +
    writel(VPSS_CLK_CTRL_VENCCLKEN |
    VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2);

    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-15 17:45    [W:4.073 / U:0.736 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site