From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Fri, 25 Jun 2021 02:19:05 +1000 Subject: [PATCH] kern/file: Do not leak device_name on error in grub_file_open() If we have an error in grub_file_open() before we free device_name, we will leak it. Free device_name in the error path and null out the pointer in the good path once we free it there. Signed-off-by: Daniel Axtens Reviewed-by: Daniel Kiper (cherry picked from commit 1499a5068839fa37cb77ecef4b5bdacbd1ed12ea) (cherry picked from commit 2ec50b289d8b24922433439533113087f111f110) (cherry picked from commit 17c36ae88d7d6040cabc01cd4a21e71ff4731668) (cherry picked from commit 9c2f4b2da5ce570d5614a0849bdae9a95ed1f311) --- grub-core/kern/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c index 24da12bb99..ec8c0265bc 100644 --- a/grub-core/kern/file.c +++ b/grub-core/kern/file.c @@ -80,6 +80,7 @@ grub_file_open (const char *name) device = grub_device_open (device_name); grub_free (device_name); + device_name = NULL; if (! device) goto fail; @@ -121,6 +122,7 @@ grub_file_open (const char *name) return file; fail: + grub_free (device_name); if (device) grub_device_close (device);