|
 |
c4a49e5 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
c4a49e5 |
From: "t.feng" <fengtao40@huawei.com>
|
|
|
c4a49e5 |
Date: Tue, 29 Nov 2022 17:14:15 +0800
|
|
|
c4a49e5 |
Subject: [PATCH] fs/xfs: Fix memory leaks in XFS module
|
|
|
c4a49e5 |
|
|
|
c4a49e5 |
Signed-off-by: t.feng <fengtao40@huawei.com>
|
|
|
c4a49e5 |
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
c4a49e5 |
---
|
|
|
c4a49e5 |
grub-core/fs/xfs.c | 11 +++++++++--
|
|
|
c4a49e5 |
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
c4a49e5 |
|
|
|
c4a49e5 |
diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
|
|
|
c4a49e5 |
index d6de7f1a2dd2..b67407690c1a 100644
|
|
|
c4a49e5 |
--- a/grub-core/fs/xfs.c
|
|
|
c4a49e5 |
+++ b/grub-core/fs/xfs.c
|
|
|
c4a49e5 |
@@ -585,7 +585,10 @@ grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
|
|
|
c4a49e5 |
if (grub_disk_read (node->data->disk,
|
|
|
c4a49e5 |
GRUB_XFS_FSB_TO_BLOCK (node->data, get_fsb (keys, i - 1 + recoffset)) << (node->data->sblock.log2_bsize - GRUB_DISK_SECTOR_BITS),
|
|
|
c4a49e5 |
0, node->data->bsize, leaf))
|
|
|
c4a49e5 |
- return 0;
|
|
|
c4a49e5 |
+ {
|
|
|
c4a49e5 |
+ grub_free (leaf);
|
|
|
c4a49e5 |
+ return 0;
|
|
|
c4a49e5 |
+ }
|
|
|
c4a49e5 |
|
|
|
c4a49e5 |
if ((!node->data->hascrc &&
|
|
|
c4a49e5 |
grub_strncmp ((char *) leaf->magic, "BMAP", 4)) ||
|
|
|
c4a49e5 |
@@ -751,6 +754,7 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename,
|
|
|
c4a49e5 |
if (err)
|
|
|
c4a49e5 |
{
|
|
|
c4a49e5 |
grub_print_error ();
|
|
|
c4a49e5 |
+ grub_free (fdiro);
|
|
|
c4a49e5 |
return 0;
|
|
|
c4a49e5 |
}
|
|
|
c4a49e5 |
|
|
|
c4a49e5 |
@@ -861,7 +865,10 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
|
|
|
c4a49e5 |
blk << dirblk_log2,
|
|
|
c4a49e5 |
dirblk_size, dirblock, 0);
|
|
|
c4a49e5 |
if (numread != dirblk_size)
|
|
|
c4a49e5 |
- return 0;
|
|
|
c4a49e5 |
+ {
|
|
|
c4a49e5 |
+ grub_free (dirblock);
|
|
|
c4a49e5 |
+ return 0;
|
|
|
c4a49e5 |
+ }
|
|
|
c4a49e5 |
|
|
|
c4a49e5 |
entries = (grub_be_to_cpu32 (tail->leaf_count)
|
|
|
c4a49e5 |
- grub_be_to_cpu32 (tail->leaf_stale));
|