fbdev:modedb: fix a possible UAF in fb_find_mode()
Subsystems (2)
PATCH v2 1/1 fbdev:modedb: fix a possible UAF in fb_find_mode()
If mode_option is NULL, it is assigned from mode_option_buf:
if (!mode_option) {
fb_get_options(NULL, &mode_option_buf);
mode_option = mode_option_buf;
}Later, name is assigned from mode_option:
const char *name = mode_option;
However, mode_option_buf is freed before name is no longer used:
kfree(mode_option_buf);
while name is still accessed by:
if ((name_matches(db[i], name, namelen) ||
Since name aliases mode_option_buf, this may result in a use-after-free.
Fix this by extending the lifetime of mode_option_buf until the end of the function and using scope-based resource management for cleanup.
---
v2:
* Use scope-based resource management instead of manual kfree() calls. Thanks to Helge Deller for the helpful advice.
--- drivers/video/fbdev/core/modedb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/video/fbdev/core/modedb.c +1 -2
@@ -626,7 +626,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,const struct fb_videomode *default_mode, unsigned int default_bpp) { - char *mode_option_buf = NULL; + char *mode_option_buf __free(kfree) = NULL;int i;/* Set up defaults */
@@ -724,7 +724,6 @@ int fb_find_mode(struct fb_var_screeninfo *var, res_specified =1 ; } done: -kfree (mode_option_buf);if (cvt) {struct fb_videomode cvt_mode;int ret;
Signature · 1 line
2.43.0
Hi Tuo, Helge,
Quoted 22 lines · Tuo Li
If
mode_optionis NULL, it is assigned frommode_option_buf:if (!mode_option) { fb_get_options(NULL, &mode_option_buf); mode_option = mode_option_buf; }Later, name is assigned from
mode_option:const char *name = mode_option;However,
mode_option_bufis freed before name is no longer used:kfree(mode_option_buf);while name is still accessed by:
if ((
name_matches(db[i], name, namelen)||Since name aliases
mode_option_buf, this may result in a use-after-free.
Quoted 8 lines
Fix this by extending the lifetime of
mode_option_bufuntil the end of the function and using scope-based resource management for cleanup.Signed-off-by Tuo Li <[email protected]>---
v2:
* Use scope-based resource management instead of manualkfree()calls. Thanks to Helge Deller for the helpful advice.
Thanks for your patch, which is now commit 85b6256469cebdac ("fbdev:
modedb: fix a possible UAF in fb_find_mode()") in fbdev/for-next, and has:
Cc: [email protected] # v6.5+
I believe it needs:
fb_get_option() in modedb")
and that commit entered v6.4-rc1, i.e. not v6.5?
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Helge Deller
maintainerQuoted 37 lines · Geert Uytterhoeven
Hi Tuo, Helge,
Quoted 22 lines · Tuo Li
If
mode_optionis NULL, it is assigned frommode_option_buf:if (!mode_option) { fb_get_options(NULL, &mode_option_buf); mode_option = mode_option_buf; }Later, name is assigned from
mode_option:const char *name = mode_option;However,
mode_option_bufis freed before name is no longer used:kfree(mode_option_buf);while name is still accessed by:
if ((name_matches(db[i], name, namelen) ||Since name aliases
mode_option_buf, this may result in a use-after-free.Quoted 8 lines
Fix this by extending the lifetime of
mode_option_bufuntil the end of the function and using scope-based resource management for cleanup.Signed-off-by Tuo Li <[email protected]>---
v2:
* Use scope-based resource management instead of manualkfree()calls. Thanks to Helge Deller for the helpful advice.Thanks for your patch, which is now commit
85b6256469cebdac("fbdev:
modedb: fix a possible UAF infb_find_mode()") in fbdev/for-next, and has:
Quoted 7 lines
Cc: [email protected] # v6.5+I believe it needs:
Fixes 089d924d03d5c17b ("fbdev: Read video= option with
fb_get_option()in modedb")and that commit entered v6.4-rc1, i.e. not v6.5?
Right, but I added the v6.5+ tag, because this patch uses the "__cleanup() based infrastructure", which I think was introduced with v6.5.
Helge