bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 06:44:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

s390: Drop unnecessary CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT

Browse Source 
Commit b5ca117365 ("ima: prevent kexec_load syscall based on runtime
secureboot flag") and commit 268a784049 ("s390/kexec_file: Disable
kexec_load when IPLed secure") disabled the kexec_load syscall based
on the secureboot mode. Commit 9e2b4be377 ("ima: add a new CONFIG
for loading arch-specific policies") needed to detect the secure boot
mode, not to load an IMA architecture specific policy. Since there is
the new CONFIG_INTEGRITY_SECURE_BOOT, drop
CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT for s390.

Signed-off-by: Coiby Xu <coxu@redhat.com>
Tested-by: Alexander Egorenkov <egorenar@linux.ibm.com>
[Vasily Gorbik: Fix missing arch_get_secureboot() prototype warning]
link: https://lore.kernel.org/linux-integrity/c00-01.ttbfdx5@ub.hpns/
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
Coiby Xu
2026-02-13 09:28:48 +08:00
committed by Mimi Zohar
parent cf75c86320
commit a2e507afd9
4 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/s390/Kconfig
View File

@@ -80,7 +80,6 @@ config S390
# #
# Note: keep this list sorted alphabetically # Note: keep this list sorted alphabetically
# #
imply IMA_SECURE_AND_OR_TRUSTED_BOOT
select ALTERNATE_USER_ADDRESS_SPACE select ALTERNATE_USER_ADDRESS_SPACE
select ARCH_32BIT_USTAT_F_TINODE select ARCH_32BIT_USTAT_F_TINODE
select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE

1
arch/s390/kernel/Makefile
View File

@@ -71,7 +71,6 @@ obj-$(CONFIG_STACKPROTECTOR) += stackprotector.o
obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o kexec_image.o obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o kexec_image.o
obj-$(CONFIG_KEXEC_FILE) += kexec_elf.o obj-$(CONFIG_KEXEC_FILE) += kexec_elf.o
obj-$(CONFIG_CERT_STORE) += cert_store.o obj-$(CONFIG_CERT_STORE) += cert_store.o
obj-$(CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT) += ima_arch.o
obj-$(CONFIG_PERF_EVENTS) += perf_event.o obj-$(CONFIG_PERF_EVENTS) += perf_event.o
obj-$(CONFIG_PERF_EVENTS) += perf_cpum_cf.o perf_cpum_sf.o obj-$(CONFIG_PERF_EVENTS) += perf_cpum_cf.o perf_cpum_sf.o

8
arch/s390/kernel/ima_arch.c
View File

@@ -1,8 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/ima.h>
const char * const *arch_get_ima_policy(void)
{
return NULL;
}

1
arch/s390/kernel/ipl.c
View File

@@ -21,6 +21,7 @@
#include <linux/crash_dump.h> #include <linux/crash_dump.h>
#include <linux/debug_locks.h> #include <linux/debug_locks.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/secure_boot.h>
#include <asm/asm-extable.h> #include <asm/asm-extable.h>
#include <asm/machine.h> #include <asm/machine.h>
#include <asm/diag.h> #include <asm/diag.h>