proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-08-08 08:55:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

affs: Fix memory leaks

Browse Source 
The node structure reference is being allocated but not freed if it
reaches the end of the function. If any of the hooks had returned
a non-zero value, then node would have been copied in to the context
reference, but otherwise node is not stored and should be freed.

Similarly, the call to grub_affs_create_node() replaces the allocated
memory in node with a newly allocated structure, leaking the existing
memory pointed by node.

Finally, when dir->parent is set, then we again replace node with newly
allocated memory, which seems unnecessary when we copy in the values
from dir->parent immediately after.

Fixes: CID 73759

Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Darren Kenny 2020-11-26 12:48:07 +00:00 committed by Daniel Kiper
parent 7aab03418e
commit 178ac51073
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
grub-core/fs/affs.c
View File

@ -400,12 +400,12 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir,
{ {
unsigned int i; unsigned int i;
struct grub_affs_file file; struct grub_affs_file file;
struct grub_fshelp_node *node = 0; struct grub_fshelp_node *node, *orig_node;
struct grub_affs_data *data = dir->data; struct grub_affs_data *data = dir->data;
grub_uint32_t *hashtable; grub_uint32_t *hashtable;
/* Create the directory entries for `.' and `..'. */ /* Create the directory entries for `.' and `..'. */
node = grub_zalloc (sizeof (*node)); node = orig_node = grub_zalloc (sizeof (*node));
if (!node) if (!node)
return 1; return 1;
@ -414,9 +414,6 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir,
return 1; return 1;
if (dir->parent) if (dir->parent)
{ {
node = grub_zalloc (sizeof (*node));
if (!node)
return 1;
*node = *dir->parent; *node = *dir->parent;
if (hook ("..", GRUB_FSHELP_DIR, node, hook_data)) if (hook ("..", GRUB_FSHELP_DIR, node, hook_data))
return 1; return 1;
@ -456,17 +453,18 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir,
if (grub_affs_create_node (dir, hook, hook_data, &node, &hashtable, if (grub_affs_create_node (dir, hook, hook_data, &node, &hashtable,
next, &file)) next, &file))
return 1; {
/* Node has been replaced in function. */
grub_free (orig_node);
return 1;
}
next = grub_be_to_cpu32 (file.next); next = grub_be_to_cpu32 (file.next);
} }
} }
grub_free (hashtable);
return 0;
fail: fail:
grub_free (node); grub_free (orig_node);
grub_free (hashtable); grub_free (hashtable);
return 0; return 0;
} }