lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 137/408] video: fbdev: radeon: Fix memleak in radeonfb_pci_register
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit fe6c6a4af2be8c15bac77f7ea160f947c04840d1 ]

    When radeon_kick_out_firmware_fb() fails, info should be
    freed just like the subsequent error paths.

    Fixes: 069ee21a82344 ("fbdev: Fix loading of module radeonfb on PowerMac")
    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Reviewed-by: Mathieu Malaterre <malat@debian.org>
    Cc: Kangjie Lu <kjlu@umn.edu>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20200825062900.11210-1-dinghao.liu@zju.edu.cn
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/video/fbdev/aty/radeon_base.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c
    index 4ca07866f2f66..5dda824d0da3f 100644
    --- a/drivers/video/fbdev/aty/radeon_base.c
    +++ b/drivers/video/fbdev/aty/radeon_base.c
    @@ -2323,7 +2323,7 @@ static int radeonfb_pci_register(struct pci_dev *pdev,

    ret = radeon_kick_out_firmware_fb(pdev);
    if (ret)
    - return ret;
    + goto err_release_fb;

    /* request the mem regions */
    ret = pci_request_region(pdev, 0, "radeonfb framebuffer");
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 15:35    [W:3.191 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site