fbdev: efifb: Register sysfs groups through driver core
BugLink: https://bugs.launchpad.net/bugs/2089884 [ Upstream commit 95cdd538e0e5677efbdf8aade04ec098ab98f457 ] 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> Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
This commit is contained in:
committed by
Mehmet Basaran
parent
d0498bdf7e
commit
6d65d962c7
@@ -571,15 +571,10 @@ static int efifb_probe(struct platform_device *dev)
|
||||
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);
|
||||
if (err < 0) {
|
||||
pr_err("efifb: cannot allocate colormap\n");
|
||||
goto err_groups;
|
||||
goto err_unmap;
|
||||
}
|
||||
|
||||
if (efifb_pci_dev)
|
||||
@@ -603,8 +598,6 @@ err_put_rpm_ref:
|
||||
pm_runtime_put(&efifb_pci_dev->dev);
|
||||
|
||||
fb_dealloc_cmap(&info->cmap);
|
||||
err_groups:
|
||||
sysfs_remove_groups(&dev->dev.kobj, efifb_groups);
|
||||
err_unmap:
|
||||
if (mem_flags & (EFI_MEMORY_UC | EFI_MEMORY_WC))
|
||||
iounmap(info->screen_base);
|
||||
@@ -624,12 +617,12 @@ static void efifb_remove(struct platform_device *pdev)
|
||||
|
||||
/* efifb_destroy takes care of info cleanup */
|
||||
unregister_framebuffer(info);
|
||||
sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
|
||||
}
|
||||
|
||||
static struct platform_driver efifb_driver = {
|
||||
.driver = {
|
||||
.name = "efi-framebuffer",
|
||||
.dev_groups = efifb_groups,
|
||||
},
|
||||
.probe = efifb_probe,
|
||||
.remove_new = efifb_remove,
|
||||
|
||||
Reference in New Issue
Block a user