grub2/0367-blscfg-don-t-leak-bls_entry.filename.patch
Peter Jones ad4aff0c12 Rework SB patches and 10_linux.in changes even harder.
Apparently working on two identical trees at once is not good for doing things
right.

Resolves: rhbz#1601578
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-07-17 10:21:37 -04:00

27 lines
885 B
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Will Thompson <wjt@endlessm.com>
Date: Thu, 12 Jul 2018 10:59:10 +0100
Subject: [PATCH] blscfg: don't leak bls_entry.filename
Zeroing the bls_entry struct before calling grub_free() on one of its
fields is not going to work too well.
Signed-off-by: Will Thompson <wjt@endlessm.com>
---
grub-core/commands/blscfg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
index 077ca5dfbe6..3339d62d541 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -166,8 +166,8 @@ static void bls_free_entry(struct bls_entry *entry)
}
grub_free (entry->keyvals);
- grub_memset (entry, 0, sizeof (*entry));
grub_free (entry->filename);
+ grub_memset (entry, 0, sizeof (*entry));
grub_free (entry);
}