]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
video: fbdev: radeon: Fix memleak in radeonfb_pci_register
authorDinghao Liu <dinghao.liu@zju.edu.cn>
Tue, 25 Aug 2020 06:29:00 +0000 (14:29 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:07:35 +0000 (10:07 +0100)
[ 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

index e116a3f9ad56648c624d9b3332be87d84c696fc8..687bd2c0d5040257f5fa680d2a2189e2196f0122 100644 (file)
@@ -2311,7 +2311,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");