Add tst_secureboot_enabled() helper function
PATCH v2 1/1 Add tst_secureboot_enabled() helper function
Also check for SecureBoot status in tst_lockdown_enabled() if the lockdown sysfile is not available/readable
---
Changes since v1:
- check whether machine is in EFI mode first
The check was not strictly required, efi_get_variable() would simply fail on non-EFI systems with error message "get_variable() not implemented". But it's better to have a less confusing status message anyway.
configure.ac | 1 + include/mk/config.mk.in | 4 ++-- include/tst_lockdown.h | 1 + lib/tst_lockdown.c | 49 +++++++++++++++++++++++++++++++++++++++++ m4/ltp-libefivar.m4 | 9 ++++++++ 5 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 m4/ltp-libefivar.m4
configure.ac +1 -0
@@ -296,6 +296,7 @@ LTP_CHECK_CAPABILITY_SUPPORT LTP_CHECK_CC_WARN_OLDSTYLE LTP_CHECK_CLONE_SUPPORTS_7_ARGS LTP_CHECK_CRYPTO +LTP_CHECK_EFIVAR LTP_CHECK_FORTIFY_SOURCE LTP_CHECK_KERNEL_DEVEL LTP_CHECK_KEYUTILS_SUPPORT
include/mk/config.mk.in +2 -2
@@ -56,8 +56,8 @@ libdir := @libdir@ mandir := @mandir@ CPPFLAGS := @CPPFLAGS@ -CFLAGS := @CFLAGS@ -LDLIBS := @LIBS@ +CFLAGS := @CFLAGS@ @EFIVAR_CFLAGS@ +LDLIBS := @LIBS@ @EFIVAR_LIBS@ LDFLAGS := @LDFLAGS@ DEBUG_CFLAGS ?= -g
include/tst_lockdown.h +1 -0
@@ -5,6 +5,7 @@#define PATH_LOCKDOWN "/sys/kernel/security/lockdown" +int tst_secureboot_enabled (void );int tst_lockdown_enabled (void );#endif /* TST_LOCKDOWN_H */
lib/tst_lockdown.c +49 -0
70 lines not on this page · raw message
m4/ltp-libefivar.m4 new file +9 -0
@@ -0,0 +1,9 @@ +dnl SPDX-License-Identifier: GPL-2.0-or-later +dnl Copyright (c) 2020 SUSE LLC <[email protected]> + +AC_DEFUN([LTP_CHECK_EFIVAR], [ + dnl efivar library and headers + PKG_CHECK_MODULES([EFIVAR], [efivar], [ + AC_DEFINE([HAVE_EFIVAR], [1], [Define to 1 if you have libefivar library and headers]) + ], [have_efivar=no]) +])
Signature · 1 line
2.28.0
PATCH v2 1/1 Add tst_secureboot_enabled() helper function
Hi!
Quoted 17 lines
configure.ac +1
-0@@ -296,6 +296,7 @@ LTP_CHECK_CAPABILITY_SUPPORT LTP_CHECK_CC_WARN_OLDSTYLE LTP_CHECK_CLONE_SUPPORTS_7_ARGS LTP_CHECK_CRYPTO +LTP_CHECK_EFIVAR LTP_CHECK_FORTIFY_SOURCE LTP_CHECK_KERNEL_DEVEL LTP_CHECK_KEYUTILS_SUPPORTinclude/mk/config.mk.in +0
-0
include/mk/config.mk.in libdir := @libdir@ · line 60
Quoted 7 lines
include/mk/config.mk.in +2
-2@@ -56,8 +56,8 @@ libdir := @libdir@ mandir := @mandir@ CPPFLAGS := @CPPFLAGS@ -CFLAGS := @CFLAGS@ -LDLIBS := @LIBS@ +CFLAGS := @CFLAGS@ @EFIVAR_CFLAGS@ +LDLIBS := @LIBS@ @EFIVAR_LIBS@
Please do not do this.
This should be handled like any other library, i.e. we should define EFIVAR_CFLAGS and EFIVAR_LIBS and use them in respective Makefile.
Quoted 80 lines
include/mk/config.mk.in +0
-0LDFLAGS := @LDFLAGS@ DEBUG_CFLAGS ?= -ginclude/tst_lockdown.h +1
-0@@ -5,6 +5,7 @@#define PATH_LOCKDOWN "/sys/kernel/security/lockdown" +int tst_secureboot_enabled (void );int tst_lockdown_enabled (void );#endif /* TST_LOCKDOWN_H */ lib/tst_lockdown.c +45
-0@@ -2,21 +2,70 @@#define TST_NO_DEFAULT_MAIN +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <sys/mount.h> +#ifdef HAVE_EFIVAR +#include <efivar.h> +#endif /* HAVE_EFIVAR */ +#include "tst_test.h" #include "tst_safe_macros.h" #include "tst_safe_stdio.h" #include "tst_lockdown.h" +int tst_secureboot_enabled (void ) +{ +#ifdef HAVE_EFIVAR +int ret, status =0 ; +uint8_t *data =NULL ; +size_t size =0 ; +uint32_t attrs =0 ; + +if (!efi_variables_supported ()) { +tst_res (TINFO ,"SecureBoot: off (non-EFI system)" ); +return 0 ; + } + +efi_error_clear (); + ret =efi_get_variable (EFI_GLOBAL_GUID ,"SecureBoot" , &data, &size, + &attrs); + +if (ret) { +char *fn, *func, *msg; +int ln, err, i =0 ; + +while (efi_error_get (i++, &fn, &func, &ln, &msg, &err) >0 ) +tst_res (TINFO ,"Efivar error: %s" , msg); + +efi_error_clear (); + }else if (data) { + status = *data; +tst_res (TINFO ,"SecureBoot: %s" , status ?"on" :"off" ); + } + +if (data) +free (data); + +return status; +#else /* HAVE_EFIVAR */ +tst_res (TINFO ,"%s(): LTP was built without efivar support" , __func__); +return -1 ; +#endif /* HAVE_EFIVAR */ +} +int tst_lockdown_enabled (void ) {char line[BUFSIZ ];
lib/tst_lockdown.c line 71
Quoted 10 lines
lib/tst_lockdown.c +4
-0FILE *file;if (access (PATH_LOCKDOWN ,F_OK ) !=0 ) { +/* SecureBoot enabled means integrity lockdown */ +if (tst_secureboot_enabled () >0 ) +return 1 ; +tst_res (TINFO ,"Unable to determine system lockdown state" );return 0 ; }
And this should be put into a separate library if it requires linking againts efivars library.
Quoted 21 lines
m4/ltp-libefivar.m4 new file +9
-0@@ -0,0 +1,9 @@ +dnl SPDX-License-Identifier: GPL-2.0-or-later +dnl Copyright (c) 2020 SUSE LLC <[email protected]> + +AC_DEFUN([LTP_CHECK_EFIVAR], [ + dnl efivar library and headers + PKG_CHECK_MODULES([EFIVAR], [efivar], [ + AC_DEFINE([HAVE_EFIVAR], [1], [Define to 1 if you have libefivar library and headers]) + ], [have_efivar=no]) +])Signature · 5 lines
2.28.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/1 Add tst_secureboot_enabled() helper function
Quoted 28 lines · Cyril Hrubis
Hi!
Quoted 17 lines
configure.ac +1
-0@@ -296,6 +296,7 @@ LTP_CHECK_CAPABILITY_SUPPORT LTP_CHECK_CC_WARN_OLDSTYLE LTP_CHECK_CLONE_SUPPORTS_7_ARGS LTP_CHECK_CRYPTO +LTP_CHECK_EFIVAR LTP_CHECK_FORTIFY_SOURCE LTP_CHECK_KERNEL_DEVEL LTP_CHECK_KEYUTILS_SUPPORTinclude/mk/config.mk.in +0
-0include/mk/config.mk.in libdir := @libdir@ · line 60
Quoted 7 lines
include/mk/config.mk.in +2
-2@@ -56,8 +56,8 @@ libdir := @libdir@ mandir := @mandir@ CPPFLAGS := @CPPFLAGS@ -CFLAGS := @CFLAGS@ -LDLIBS := @LIBS@ +CFLAGS := @CFLAGS@ @EFIVAR_CFLAGS@ +LDLIBS := @LIBS@ @EFIVAR_LIBS@Please do not do this.
Quoted 2 lines
This should be handled like any other library, i.e. we should define
EFIVAR_CFLAGSandEFIVAR_LIBSand use them in respectiveMakefile.
OK. Could you add some explanation of the policy for library dependencies to the build system docs later? Thanks.
Signature · 7 lines
Martin Doucha [email protected] QA Engineer for Software Maintenance SUSE LINUX, s.r.o. CORSO IIa Krizikova 148/34 186 00 Prague 8 Czech Republic
PATCH v2 1/1 Add tst_secureboot_enabled() helper function
Hi Martin, Cyril,
...
Quoted 15 lines
Quoted 14 lines
include/mk/config.mk.in libdir := @libdir@ · line 60
Quoted 12 lines
include/mk/config.mk.in +2
-2@@ -56,8 +56,8 @@ libdir := @libdir@ mandir := @mandir@ CPPFLAGS := @CPPFLAGS@ -CFLAGS := @CFLAGS@ -LDLIBS := @LIBS@ +CFLAGS := @CFLAGS@ @EFIVAR_CFLAGS@ +LDLIBS := @LIBS@ @EFIVAR_LIBS@Please do not do this.
Quoted 2 lines
Quoted 2 lines
This should be handled like any other library, i.e. we should define
EFIVAR_CFLAGSandEFIVAR_LIBSand use them in respectiveMakefile.
+1 (and sorry for overlooking this).
Kind regards,
Petr