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

fs/iso9660: Fix invalid free

Browse Source 
The ctx->filename can point to either a string literal or a dynamically
allocated string. The ctx->filename_alloc field is used to indicate the
type of allocation.

An issue has been identified where ctx->filename is reassigned to
a string literal in susp_iterate_dir() but ctx->filename_alloc is not
correctly handled. This oversight causes a memory leak and an invalid
free operation later.

The fix involves checking ctx->filename_alloc, freeing the allocated
string if necessary and clearing ctx->filename_alloc for string literals.

Reported-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Chang <mchang@suse.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Michael Chang 2024-05-31 15:14:42 +08:00 committed by Daniel Kiper
parent 965db59708
commit 1443833a95
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
grub-core/fs/iso9660.c
View File

@ -628,9 +628,19 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry,
filename type is stored. */
/* FIXME: Fix this slightly improper cast. */
if (entry->data[0] & GRUB_ISO9660_RR_DOT)
ctx->filename = (char *) ".";
{
if (ctx->filename_alloc)
grub_free (ctx->filename);
ctx->filename_alloc = 0;
ctx->filename = (char *) ".";
}
else if (entry->data[0] & GRUB_ISO9660_RR_DOTDOT)
ctx->filename = (char *) "..";
{
if (ctx->filename_alloc)
grub_free (ctx->filename);
ctx->filename_alloc = 0;
ctx->filename = (char *) "..";
}
else if (entry->len >= 5)
{
grub_size_t off = 0, csize = 1;