1*4882a593SmuzhiyunFrom 748b691761d31bfff7e9d0d210caa606294c2b52 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 3*4882a593SmuzhiyunDate: Tue, 7 Jul 2020 22:02:31 -0400 4*4882a593SmuzhiyunSubject: [PATCH] udf: Fix memory leak 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunFixes: CID 73796 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 12*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 13*4882a593SmuzhiyunReviewed-by: Jan Setje-Eilers <jan.setjeeilers@oracle.com> 14*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun grub-core/fs/udf.c | 17 +++++++++++++---- 17*4882a593Smuzhiyun 1 file changed, 13 insertions(+), 4 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c 20*4882a593Smuzhiyunindex 21ac7f446..2ac5c1d00 100644 21*4882a593Smuzhiyun--- a/grub-core/fs/udf.c 22*4882a593Smuzhiyun+++ b/grub-core/fs/udf.c 23*4882a593Smuzhiyun@@ -965,8 +965,10 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir, 24*4882a593Smuzhiyun return 0; 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun if (grub_udf_read_icb (dir->data, &dirent.icb, child)) 27*4882a593Smuzhiyun- return 0; 28*4882a593Smuzhiyun- 29*4882a593Smuzhiyun+ { 30*4882a593Smuzhiyun+ grub_free (child); 31*4882a593Smuzhiyun+ return 0; 32*4882a593Smuzhiyun+ } 33*4882a593Smuzhiyun if (dirent.characteristics & GRUB_UDF_FID_CHAR_PARENT) 34*4882a593Smuzhiyun { 35*4882a593Smuzhiyun /* This is the parent directory. */ 36*4882a593Smuzhiyun@@ -988,11 +990,18 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir, 37*4882a593Smuzhiyun dirent.file_ident_length, 38*4882a593Smuzhiyun (char *) raw)) 39*4882a593Smuzhiyun != dirent.file_ident_length) 40*4882a593Smuzhiyun- return 0; 41*4882a593Smuzhiyun+ { 42*4882a593Smuzhiyun+ grub_free (child); 43*4882a593Smuzhiyun+ return 0; 44*4882a593Smuzhiyun+ } 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun filename = read_string (raw, dirent.file_ident_length, 0); 47*4882a593Smuzhiyun if (!filename) 48*4882a593Smuzhiyun- grub_print_error (); 49*4882a593Smuzhiyun+ { 50*4882a593Smuzhiyun+ /* As the hook won't get called. */ 51*4882a593Smuzhiyun+ grub_free (child); 52*4882a593Smuzhiyun+ grub_print_error (); 53*4882a593Smuzhiyun+ } 54*4882a593Smuzhiyun 55*4882a593Smuzhiyun if (filename && hook (filename, type, child, hook_data)) 56*4882a593Smuzhiyun { 57*4882a593Smuzhiyun-- 58*4882a593Smuzhiyun2.26.2 59*4882a593Smuzhiyun 60