Fix lockdown and secureboot check in init_module tests
PATCH 1/3 Fix lockdown and secureboot check in init_module tests
Negative return value from the helper functions means no check could be performend. Only positive return value indicates that secureboot/lockdown is active.
Signed-off-by Martin Doucha <[email protected]>
--- testcases/kernel/syscalls/finit_module/finit_module02.c | 4 ++-- testcases/kernel/syscalls/init_module/init_module02.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/finit_module/finit_module02.c +2 -2
@@ -83,8 +83,8 @@ static void setup(void)tst_module_exists (MODULE_NAME , &mod_path); - kernel_lockdown =tst_lockdown_enabled (); - secure_boot =tst_secureboot_enabled (); + kernel_lockdown =tst_lockdown_enabled () >0 ; + secure_boot =tst_secureboot_enabled () >0 ;SAFE_MKDIR (TEST_DIR ,0700 ); fd_dir =SAFE_OPEN (TEST_DIR ,O_DIRECTORY );
testcases/kernel/syscalls/init_module/init_module02.c +2 -2
@@ -53,8 +53,8 @@ static void setup(void)tst_module_exists (MODULE_NAME ,NULL ); - kernel_lockdown =tst_lockdown_enabled (); - secure_boot =tst_secureboot_enabled (); + kernel_lockdown =tst_lockdown_enabled () >0 ; + secure_boot =tst_secureboot_enabled () >0 ; fd =SAFE_OPEN (MODULE_NAME ,O_RDONLY |O_CLOEXEC );SAFE_FSTAT (fd, &sb); size = sb.st_size;
Signature · 5 lines
2.42.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 2/3 madvise11: Fix lockdown check
Negative return value from the helper functions means no check could be performend. Only positive return value indicates that secureboot/lockdown is active.
Signed-off-by Martin Doucha <[email protected]>
--- testcases/kernel/syscalls/madvise/madvise11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
testcases/kernel/syscalls/madvise/madvise11.c +1 -1
@@ -325,7 +325,7 @@ static int open_unpoison_pfn(void)TEST (open (debugfs_fp,O_WRONLY )); -if (TST_RET ==-1 &&TST_ERR ==EPERM &&tst_lockdown_enabled ()) { +if (TST_RET ==-1 &&TST_ERR ==EPERM &&tst_lockdown_enabled () >0 ) {tst_res (TINFO ,"Cannot restore soft-offlined memory due to lockdown" );return TST_RET ;
Signature · 5 lines
2.42.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 3/3 Fix shell library secureboot and lockdown helpers
In reply to Martin DouchaNegative return value from the helper functions means no check could be performend. Only positive return value indicates that secureboot/lockdown is active.
Signed-off-by Martin Doucha <[email protected]>
--- testcases/lib/tst_lockdown_enabled.c | 2 +- testcases/lib/tst_secureboot_enabled.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
testcases/lib/tst_lockdown_enabled.c +1 -1
@@ -8,5 +8,5 @@int main (void ) { -return !tst_lockdown_enabled (); +return tst_lockdown_enabled () <=0 ; }
testcases/lib/tst_secureboot_enabled.c +1 -1
@@ -8,5 +8,5 @@int main (void ) { -return !tst_secureboot_enabled (); +return tst_secureboot_enabled () <=0 ; }
Signature · 5 lines
2.42.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Patchset pushed, thanks.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp