mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
27 lines
885 B
Diff
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 a45f40fe67e..11a356de81a 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);
|
|
}
|
|
|