[PATCH] loader/i386/pc/linux: Fix resource leak

[PATCH] loader/i386/pc/linux: Fix resource leak

[Lidong Chen via Grub-devel]

In grub_cmd_initrd(), memory is allocated for variable initrd_ctx
before calling grub_relocator_alloc_chunk_align_safe(). When the
function call fails, initrd_ctx should be freed before exiting
grub_cmd_initrd().

Fixes: CID 473852

Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
---
 grub-core/loader/i386/pc/linux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
index 4adeee9ae..0c2a4ae51 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -457,7 +457,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
     err = grub_relocator_alloc_chunk_align_safe (relocator, &ch, addr_min, addr_max, size,
 						 0x1000, GRUB_RELOCATOR_PREFERENCE_HIGH, 0);
     if (err)
-      return err;
+      goto fail;
     initrd_chunk = get_virtual_current_address (ch);
     initrd_addr = get_physical_target_address (ch);
   }
-- 
2.43.5


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH] loader/i386/pc/linux: Fix resource leak

[sudhakar]

On 2025-06-23 23:16, Lidong Chen via Grub-devel wrote:
> In grub_cmd_initrd(), memory is allocated for variable initrd_ctx
> before calling grub_relocator_alloc_chunk_align_safe(). When the
> function call fails, initrd_ctx should be freed before exiting
> grub_cmd_initrd().
> 
> Fixes: CID 473852
> 
> Signed-off-by: Lidong Chen <lidong.chen@oracle.com>

it looks good..

Reviewed-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>

> ---
>  grub-core/loader/i386/pc/linux.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/grub-core/loader/i386/pc/linux.c 
> b/grub-core/loader/i386/pc/linux.c
> index 4adeee9ae..0c2a4ae51 100644
> --- a/grub-core/loader/i386/pc/linux.c
> +++ b/grub-core/loader/i386/pc/linux.c
> @@ -457,7 +457,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__
> ((unused)),
>      err = grub_relocator_alloc_chunk_align_safe (relocator, &ch,
> addr_min, addr_max, size,
>  						 0x1000, GRUB_RELOCATOR_PREFERENCE_HIGH, 0);
>      if (err)
> -      return err;
> +      goto fail;
>      initrd_chunk = get_virtual_current_address (ch);
>      initrd_addr = get_physical_target_address (ch);
>    }

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Re: [PATCH] loader/i386/pc/linux: Fix resource leak

[Daniel Kiper via Grub-devel]

On Tue, Jun 24, 2025 at 12:27:17AM +0530, sudhakar wrote:
> On 2025-06-23 23:16, Lidong Chen via Grub-devel wrote:
> > In grub_cmd_initrd(), memory is allocated for variable initrd_ctx
> > before calling grub_relocator_alloc_chunk_align_safe(). When the
> > function call fails, initrd_ctx should be freed before exiting
> > grub_cmd_initrd().
> >
> > Fixes: CID 473852
> >
> > Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
>
> it looks good..
>
> Reviewed-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel