mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 06:49:35 +00:00
kern/rescue_parser: Ensure that parser allocated memory is not leaked
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:
1 parent
8541f319cb
commit
62f0489aff
2 files changed
+10
-2
No files matched your search
@@ -298,6 +298,8 @@ grub_parser_split_cmdline (const char *cmdline,
|
||||
|
||||
fail:
|
||||
grub_free (*argv);
|
||||
*argv = NULL;
|
||||
*argc = 0;
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
||||
@@ -36,10 +36,16 @@ grub_rescue_parse_line (char *line,
|
||||
|
||||
if (grub_parser_split_cmdline (line, getline, getline_data, &n, &args)
|
||||
|| n < 0)
|
||||
return grub_errno;
|
||||
{
|
||||
grub_free(args);
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
if (n == 0)
|
||||
return GRUB_ERR_NONE;
|
||||
{
|
||||
grub_free(args);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
/* In case of an assignment set the environment accordingly
|
||||
instead of calling a function. */
|
||||
|
||||
Reference in new issue
Block a user