You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.2 KiB
40 lines
1.2 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Daniel Axtens <dja@axtens.net> |
|
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 <dja@axtens.net> |
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> |
|
(cherry picked from commit 1499a5068839fa37cb77ecef4b5bdacbd1ed12ea) |
|
(cherry picked from commit 2ec50b289d8b24922433439533113087f111f110) |
|
--- |
|
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 e19aea3e51..ed69fc0f0f 100644 |
|
--- a/grub-core/kern/file.c |
|
+++ b/grub-core/kern/file.c |
|
@@ -81,6 +81,7 @@ grub_file_open (const char *name, enum grub_file_type type) |
|
|
|
device = grub_device_open (device_name); |
|
grub_free (device_name); |
|
+ device_name = NULL; |
|
if (! device) |
|
goto fail; |
|
|
|
@@ -135,6 +136,7 @@ grub_file_open (const char *name, enum grub_file_type type) |
|
return file; |
|
|
|
fail: |
|
+ grub_free (device_name); |
|
if (device) |
|
grub_device_close (device); |
|
|
|
|