]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
fs/xfs: Fix memory leaks in XFS module
authort.feng <fengtao40@huawei.com>
Tue, 29 Nov 2022 09:14:15 +0000 (17:14 +0800)
committerDaniel Kiper <daniel.kiper@oracle.com>
Wed, 7 Dec 2022 22:38:26 +0000 (23:38 +0100)
Signed-off-by: t.feng <fengtao40@huawei.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
grub-core/fs/xfs.c

index d6de7f1a2dd21bcbb5e7fa74a43e176dfd662ace..b67407690c1add6e154ecda81f0469cba3b281c9 100644 (file)
@@ -585,7 +585,10 @@ grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
           if (grub_disk_read (node->data->disk,
                               GRUB_XFS_FSB_TO_BLOCK (node->data, get_fsb (keys, i - 1 + recoffset)) << (node->data->sblock.log2_bsize - GRUB_DISK_SECTOR_BITS),
                               0, node->data->bsize, leaf))
-            return 0;
+            {
+              grub_free (leaf);
+              return 0;
+            }
 
          if ((!node->data->hascrc &&
               grub_strncmp ((char *) leaf->magic, "BMAP", 4)) ||
@@ -751,6 +754,7 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename,
   if (err)
     {
       grub_print_error ();
+      grub_free (fdiro);
       return 0;
     }
 
@@ -861,7 +865,10 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
                                          blk << dirblk_log2,
                                          dirblk_size, dirblock, 0);
            if (numread != dirblk_size)
-             return 0;
+             {
+               grub_free (dirblock);
+               return 0;
+             }
 
            entries = (grub_be_to_cpu32 (tail->leaf_count)
                       - grub_be_to_cpu32 (tail->leaf_stale));