tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kern/rescue_parser: Ensure that parser allocated memory is not leaked

Browse Source 
While it would appear unlikely that the memory allocated in *argv in
grub_parser_split_cmdline() would be leaked, we should try ensure that
it doesn't leak by calling grub_free() before we return from
grub_rescue_parse_line().

To avoid a possible double-free, grub_parser_split_cmdline() is being
changed to assign *argv = NULL when we've called grub_free() in the fail
section.

Fixes: CID 96680

Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Darren Kenny 2022-03-16 17:25:05 +00:00 committed by Daniel Kiper
parent 8541f319cb
commit 62f0489aff
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grub-core/kern/parser.c
View File

@ -298,6 +298,8 @@ grub_parser_split_cmdline (const char *cmdline,
fail: fail:
grub_free (*argv); grub_free (*argv);
*argv = NULL;
*argc = 0;
goto out; goto out;
} }

10
grub-core/kern/rescue_parser.c
View File

@ -36,10 +36,16 @@ grub_rescue_parse_line (char *line,
if (grub_parser_split_cmdline (line, getline, getline_data, &n, &args) if (grub_parser_split_cmdline (line, getline, getline_data, &n, &args)
|| n < 0) || n < 0)
return grub_errno; {
grub_free(args);
return grub_errno;
}
if (n == 0) if (n == 0)
return GRUB_ERR_NONE; {
grub_free(args);
return GRUB_ERR_NONE;
}
/* In case of an assignment set the environment accordingly /* In case of an assignment set the environment accordingly
instead of calling a function. */ instead of calling a function. */