From: Felix Fu fuzhen5@huawei.com

hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881 CVE: NA

-----------------------------------------

This reverts commit e464994b10c4d427b458e16ac6b8b71aba5e2738.

Signed-off-by: Felix Fu fuzhen5@huawei.com --- init/main.c | 2 -- security/Kconfig | 6 ------ 2 files changed, 8 deletions(-)

diff --git a/init/main.c b/init/main.c index 803332dd3d90..8fdfa69dba0f 100644 --- a/init/main.c +++ b/init/main.c @@ -574,7 +574,6 @@ static int __init unknown_bootoption(char *param, char *val, return 0; }

-#ifndef CONFIG_SECURITY_BOOT_INIT static int __init init_setup(char *str) { unsigned int i; @@ -603,7 +602,6 @@ static int __init rdinit_setup(char *str) return 1; } __setup("rdinit=", rdinit_setup); -#endif

#ifndef CONFIG_SMP static const unsigned int setup_max_cpus = NR_CPUS; diff --git a/security/Kconfig b/security/Kconfig index 9a6b9a115bb9..52c9af08ad35 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -249,11 +249,5 @@ config LSM

source "security/Kconfig.hardening"

-config SECURITY_BOOT_INIT - bool "Disable init & rdinit parameters in cmdline" - default n - help - No support init and rdinit parameters in cmdline - endmenu