MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-07 18:05:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fbdev: efifb: Register sysfs groups through driver core

Browse Source 
[ Upstream commit 95cdd538e0 ]

The driver core can register and cleanup sysfs groups already.
Make use of that functionality to simplify the error handling and
cleanup.

Also avoid a UAF race during unregistering where the sysctl attributes
were usable after the info struct was freed.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Thomas Weißschuh 2024-08-27 17:25:13 +02:00 committed by Greg Kroah-Hartman
parent 4b101d2f40
commit 36bfefb6ba
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/video/fbdev/efifb.c
View File

@ -571,15 +571,10 @@ static int efifb_probe(struct platform_device *dev)
break; break;
} }
err = sysfs_create_groups(&dev->dev.kobj, efifb_groups);
if (err) {
pr_err("efifb: cannot add sysfs attrs\n");
goto err_unmap;
}
err = fb_alloc_cmap(&info->cmap, 256, 0); err = fb_alloc_cmap(&info->cmap, 256, 0);
if (err < 0) { if (err < 0) {
pr_err("efifb: cannot allocate colormap\n"); pr_err("efifb: cannot allocate colormap\n");
goto err_groups; goto err_unmap;
} }
if (efifb_pci_dev) if (efifb_pci_dev)
@ -603,8 +598,6 @@ err_put_rpm_ref:
pm_runtime_put(&efifb_pci_dev->dev); pm_runtime_put(&efifb_pci_dev->dev);
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);
err_groups:
sysfs_remove_groups(&dev->dev.kobj, efifb_groups);
err_unmap: err_unmap:
if (mem_flags & (EFI_MEMORY_UC | EFI_MEMORY_WC)) if (mem_flags & (EFI_MEMORY_UC | EFI_MEMORY_WC))
iounmap(info->screen_base); iounmap(info->screen_base);
@ -624,12 +617,12 @@ static void efifb_remove(struct platform_device *pdev)
/* efifb_destroy takes care of info cleanup */ /* efifb_destroy takes care of info cleanup */
unregister_framebuffer(info); unregister_framebuffer(info);
sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
} }
static struct platform_driver efifb_driver = { static struct platform_driver efifb_driver = {
.driver = { .driver = {
.name = "efi-framebuffer", .name = "efi-framebuffer",
.dev_groups = efifb_groups,
}, },
.probe = efifb_probe, .probe = efifb_probe,
.remove_new = efifb_remove, .remove_new = efifb_remove,