[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V2 8/9] fs/squash4: Fix memeory leak in grub_squash_iterate_dir
From: |
t . feng |
Subject: |
[PATCH V2 8/9] fs/squash4: Fix memeory leak in grub_squash_iterate_dir |
Date: |
Tue, 29 Nov 2022 17:14:14 +0800 |
Fix memory leaks in grub_squash_iterate_dir.
Fixes: 20dd511c8(Handle "." and ".." on squashfs.)
Signed-off-by: "t.feng" <fengtao40@huawei.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
grub-core/fs/squash4.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c
index 02b1f9b6d..a30e6ebe1 100644
--- a/grub-core/fs/squash4.c
+++ b/grub-core/fs/squash4.c
@@ -550,7 +550,10 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir,
+ node->stack[node->stsize - 1].ino_chunk,
node->stack[node->stsize - 1].ino_offset);
if (err)
- return 0;
+ {
+ grub_free (node);
+ return 0;
+ }
if (hook ("..", GRUB_FSHELP_DIR, node, hook_data))
return 1;
@@ -600,7 +603,10 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir,
grub_le_to_cpu64 (dir->data->sb.diroffset)
+ chunk, off);
if (err)
- return 0;
+ {
+ grub_free (buf);
+ return 0;
+ }
off += grub_le_to_cpu16 (di.namelen) + 1;
buf[grub_le_to_cpu16 (di.namelen) + 1] = 0;
@@ -612,11 +618,17 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir,
if (grub_add (dir->stsize, 1, &sz) ||
grub_mul (sz, sizeof (dir->stack[0]), &sz) ||
grub_add (sz, sizeof (*node), &sz))
- return 0;
+ {
+ grub_free (buf);
+ return 0;
+ }
node = grub_malloc (sz);
if (! node)
- return 0;
+ {
+ grub_free (buf);
+ return 0;
+ }
grub_memcpy (node, dir, sz - sizeof(dir->stack[0]));
--
2.27.0
- [PATCH V2 0/9] fix memory leaks in fs module, t . feng, 2022/11/29
- [PATCH V2 3/9] fs/minix: Fix memory leak in grub_minix_lookup_symlink, t . feng, 2022/11/29
- [PATCH V2 7/9] fs/iso9660: Fix memory leak in grub_iso9660_susp_iterate, t . feng, 2022/11/29
- [PATCH V2 2/9] fs/btrfs: Fix memory leak in find_path, t . feng, 2022/11/29
- [PATCH V2 8/9] fs/squash4: Fix memeory leak in grub_squash_iterate_dir,
t . feng <=
- [PATCH V2 6/9] fs/hfsplus: Fix memory leak in grub_hfsplus_btree_search, t . feng, 2022/11/29
- [PATCH V2 9/9] fs/xfs: Fix memory leaks in xfs, t . feng, 2022/11/29
- [PATCH V2 5/9] fs/bfs: Fix memory leak in read_bfs_file, t . feng, 2022/11/29
- [PATCH V2 1/9] fs/affs:Fix memory leaks in grub_affs_create_node, t . feng, 2022/11/29
- [PATCH V2 4/9] fs/ntfs: Fix memory leak in grub_ntfs_read_symlink, t . feng, 2022/11/29
- Re: [PATCH V2 0/9] fix memory leaks in fs module, Daniel Kiper, 2022/11/29