Unverified Commit 02036602 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10795 Revert "security: restrict init parameters by configuration" 

Merge Pull Request from: @ci-robot 
 
PR sync from: felix <fuzhen5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XYFIOKFVJSQNMRXWHYSSQFGCCX5UICUW/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAI881 
 
Link:https://gitee.com/openeuler/kernel/pulls/10795

 

Reviewed-by: default avatarLu Jialin <lujialin4@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 974449b6 57eb1dd7

init/main.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

security/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -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