rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-28 07:44:52 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Fix missing format specifier in appended signature commit

Browse source 
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-03-21 17:01:32 +00:00
parent 90dacf59d0
commit ac0e146ae3
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
0175-appended-signatures-support-verifying-appended-signa.patch
View file

@ -20,6 +20,8 @@ other mechanisms, such as a password or lockdown, must be used to ensure
that a user cannot drop to the grub shell and disable verification. that a user cannot drop to the grub shell and disable verification.
Signed-off-by: Daniel Axtens <dja@axtens.net> Signed-off-by: Daniel Axtens <dja@axtens.net>
[pjones: fix missing format specifier]
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
--- ---
grub-core/Makefile.core.def | 12 + grub-core/Makefile.core.def | 12 +
grub-core/commands/appendedsig/appendedsig.c | 645 +++++++++++++++++++++++++++ grub-core/commands/appendedsig/appendedsig.c | 645 +++++++++++++++++++++++++++
@ -52,7 +54,7 @@ index b4aaccf7b57..77321d218c8 100644
common = commands/hdparm.c; common = commands/hdparm.c;
diff --git a/grub-core/commands/appendedsig/appendedsig.c b/grub-core/commands/appendedsig/appendedsig.c diff --git a/grub-core/commands/appendedsig/appendedsig.c b/grub-core/commands/appendedsig/appendedsig.c
new file mode 100644 new file mode 100644
index 00000000000..dc294cd339e index 00000000000..bf8b18b6205
--- /dev/null --- /dev/null
+++ b/grub-core/commands/appendedsig/appendedsig.c +++ b/grub-core/commands/appendedsig/appendedsig.c
@@ -0,0 +1,645 @@ @@ -0,0 +1,645 @@
@ -387,7 +389,7 @@ index 00000000000..dc294cd339e
+ data = grub_malloc (file_size); + data = grub_malloc (file_size);
+ if (!data) + if (!data)
+ return grub_error (GRUB_ERR_OUT_OF_MEMORY, + return grub_error (GRUB_ERR_OUT_OF_MEMORY,
+ N_("Could not allocate data buffer size " + N_("Could not allocate data buffer size %"
+ PRIuGRUB_UINT64_T " for verification"), file_size); + PRIuGRUB_UINT64_T " for verification"), file_size);
+ +
+ while (total_read_size < file_size) + while (total_read_size < file_size)

5
grub2.spec
View file

@ -17,7 +17,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 23%{?dist} Release: 24%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -526,6 +526,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Mon Mar 21 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-24
- Fix missing format specifier in appended signature commit
* Fri Mar 18 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-23 * Fri Mar 18 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-23
- Don't verify kernels twice - Don't verify kernels twice