proxmox-mirrors/efi-boot-shim
1
0
Fork 0
mirror of https://git.proxmox.com/git/efi-boot-shim synced 2025-10-04 11:58:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix test segfaults

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2025-03-24 13:37:47 +01:00
parent 5ecfcdc1ef
commit 71a5b86588
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/patches/series vendored Normal file
View File

@ -0,0 +1 @@
test-mock-variables-explicitly-skip-CONFIG_ONLY-vars.patch

45
debian/patches/test-mock-variables-explicitly-skip-CONFIG_ONLY-vars.patch vendored Normal file
View File

@ -0,0 +1,45 @@
From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Mon, 24 Mar 2025 12:58:56 +0100
Subject: test-mock-variables: explicitly skip CONFIG_ONLY vars
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
otherwise we might pass invalid pointers to load_variables and cause
segfaults in test cases.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
Submitted upstream: https://github.com/rhboot/shim/pull/739/
test-mock-variables.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/test-mock-variables.c b/test-mock-variables.c
index f869300..dd4a9eb 100644
--- a/test-mock-variables.c
+++ b/test-mock-variables.c
@@ -212,8 +212,10 @@ test_gnvn_helper(char *testvars)
* mok mirroring that aren't really from mok; right now
* this is a reasonable heuristic for that.
*/
- if (mok_state_variables[i].flags & MOK_VARIABLE_CONFIG_ONLY)
+ if (mok_state_variables[i].flags & MOK_VARIABLE_CONFIG_ONLY) {
+ mok_rt_vars[i] = "";
continue;
+ }
mok_rt_vars[i] = mok_state_variables[i].rtname8;
}
@@ -313,8 +315,10 @@ test_get_variable_0(void)
* mok mirroring that aren't really from mok; right now
* this is a reasonable heuristic for that.
*/
- if (mok_state_variables[i].flags & MOK_VARIABLE_CONFIG_ONLY)
+ if (mok_state_variables[i].flags & MOK_VARIABLE_CONFIG_ONLY) {
+ mok_rt_vars[i] = "";
continue;
+ }
mok_rt_vars[i] = mok_state_variables[i].rtname8;
}