57 lines
1.5 KiB
Diff
57 lines
1.5 KiB
Diff
|
From 1864839f0e0eeb2b93a5b20e4e36f9b80abc3c23 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
||
|
|
Date: Tue, 7 Jul 2020 22:02:31 -0400
|
||
|
|
Subject: [PATCH 292/314] udf: Fix memory leak
|
||
|
|
|
||
|
|
Fixes: CID 73796
|
||
|
|
|
||
|
|
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
Reviewed-by: Jan Setje-Eilers <jan.setjeeilers@oracle.com>
|
||
|
|
Upstream-commit-id: 8da62d8183c
|
||
|
|
---
|
||
|
|
grub-core/fs/udf.c | 17 +++++++++++++----
|
||
|
|
1 file changed, 13 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
|
||
|
|
index be41b48f913..6670beb5665 100644
|
||
|
|
--- a/grub-core/fs/udf.c
|
||
|
|
+++ b/grub-core/fs/udf.c
|
||
|
|
@@ -965,8 +965,10 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
if (grub_udf_read_icb (dir->data, &dirent.icb, child))
|
||
|
|
- return 0;
|
||
|
|
-
|
||
|
|
+ {
|
||
|
|
+ grub_free (child);
|
||
|
|
+ return 0;
|
||
|
|
+ }
|
||
|
|
if (dirent.characteristics & GRUB_UDF_FID_CHAR_PARENT)
|
||
|
|
{
|
||
|
|
/* This is the parent directory. */
|
||
|
|
@@ -988,11 +990,18 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
|
||
|
|
dirent.file_ident_length,
|
||
|
|
(char *) raw))
|
||
|
|
!= dirent.file_ident_length)
|
||
|
|
- return 0;
|
||
|
|
+ {
|
||
|
|
+ grub_free (child);
|
||
|
|
+ return 0;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
filename = read_string (raw, dirent.file_ident_length, 0);
|
||
|
|
if (!filename)
|
||
|
|
- grub_print_error ();
|
||
|
|
+ {
|
||
|
|
+ /* As the hook won't get called. */
|
||
|
|
+ grub_free (child);
|
||
|
|
+ grub_print_error ();
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if (filename && hook (filename, type, child, hook_data))
|
||
|
|
{
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|