Skip to content

Commit 1b5853d

Browse files
martinezjavierLucas De Marchi
authored andcommitted
fbdev: efifb: Fix a use-after-free due early fb_info cleanup
Commit d258d00 ("fbdev: efifb: Cleanup fb_info in .fb_destroy rather than .remove") attempted to fix a use-after-free error due driver freeing the fb_info in the .remove handler instead of doing it in .fb_destroy. But ironically that change introduced yet another use-after-free since the fb_info was still used after the free. This should fix for good by freeing the fb_info at the end of the handler. Fixes: d258d00 ("fbdev: efifb: Cleanup fb_info in .fb_destroy rather than .remove") Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reported-by: Andrzej Hajda <andrzej.hajda@intel.com> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> Reviewed-by: Thomas Zimmermann <tzimemrmann@suse.de> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220506132225.588379-1-javierm@redhat.com
1 parent ab244be commit 1b5853d

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/video/fbdev/efifb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,12 @@ static void efifb_destroy(struct fb_info *info)
259259
memunmap(info->screen_base);
260260
}
261261

262-
framebuffer_release(info);
263-
264262
if (request_mem_succeeded)
265263
release_mem_region(info->apertures->ranges[0].base,
266264
info->apertures->ranges[0].size);
267265
fb_dealloc_cmap(&info->cmap);
266+
267+
framebuffer_release(info);
268268
}
269269

270270
static const struct fb_ops efifb_ops = {

0 commit comments

Comments
 (0)