lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 204/258] video: clps711x-fb: release disp device node in probe()
    Date
    From: Alexey Khoroshilov <khoroshilov@ispras.ru>

    [ Upstream commit fdac751355cd76e049f628afe6acb8ff4b1399f7 ]

    clps711x_fb_probe() increments refcnt of disp device node by
    of_parse_phandle() and leaves it undecremented on both
    successful and error paths.

    Found by Linux Driver Verification project (linuxtesting.org).

    Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
    Cc: Alexander Shiyan <shc_work@mail.ru>
    Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/video/fbdev/clps711x-fb.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/video/fbdev/clps711x-fb.c b/drivers/video/fbdev/clps711x-fb.c
    index ff561073ee4e..42f909618f04 100644
    --- a/drivers/video/fbdev/clps711x-fb.c
    +++ b/drivers/video/fbdev/clps711x-fb.c
    @@ -287,14 +287,17 @@ static int clps711x_fb_probe(struct platform_device *pdev)
    }

    ret = of_get_fb_videomode(disp, &cfb->mode, OF_USE_NATIVE_MODE);
    - if (ret)
    + if (ret) {
    + of_node_put(disp);
    goto out_fb_release;
    + }

    of_property_read_u32(disp, "ac-prescale", &cfb->ac_prescale);
    cfb->cmap_invert = of_property_read_bool(disp, "cmap-invert");

    ret = of_property_read_u32(disp, "bits-per-pixel",
    &info->var.bits_per_pixel);
    + of_node_put(disp);
    if (ret)
    goto out_fb_release;

    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 18:12    [W:3.514 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site