Commit b048ae6e authored by Kees Cook's avatar Kees Cook Committed by James Morris
Browse files

LSM: Rename .security_initcall section to .lsm_info 



In preparation for switching from initcall to just a regular set of
pointers in a section, rename the internal section name.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Reviewed-by: default avatarJames Morris <james.morris@microsoft.com>
Reviewed-by: default avatarJohn Johansen <john.johansen@canonical.com>
Signed-off-by: default avatarJames Morris <james.morris@microsoft.com>
parent 1e80cd16

include/asm-generic/vmlinux.lds.h

+5 −5
Original line number Diff line number Diff line
@@ -787,14 +787,14 @@ 
		__con_initcall_end = .;



#define SECURITY_INITCALL						\

		__security_initcall_start = .;				\

		KEEP(*(.security_initcall.init))			\

		__security_initcall_end = .;

		__start_lsm_info = .;					\

		KEEP(*(.lsm_info.init))					\

		__end_lsm_info = .;



/* Older linker script style for security init. */

#define SECURITY_INIT							\

	.security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \

		SECURITY_INITCALL					\

	.lsm_info.init : AT(ADDR(.lsm_info.init) - LOAD_OFFSET) {	\

		LSM_INFO						\

	}



#ifdef CONFIG_BLK_DEV_INITRD

include/linux/init.h

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static inline initcall_t initcall_from_entry(initcall_entry_t *entry) 
#endif



extern initcall_entry_t __con_initcall_start[], __con_initcall_end[];

extern initcall_entry_t __security_initcall_start[], __security_initcall_end[];

extern initcall_entry_t __start_lsm_info[], __end_lsm_info[];



/* Used for contructor calls. */

typedef void (*ctor_fn_t)(void);
@@ -236,7 +236,7 @@ extern bool initcall_debug; 
	static exitcall_t __exitcall_##fn __exit_call = fn



#define console_initcall(fn)	___define_initcall(fn,, .con_initcall)

#define security_initcall(fn)	___define_initcall(fn,, .security_initcall)

#define security_initcall(fn)	___define_initcall(fn,, .lsm_info)



struct obs_kernel_param {

	const char *str;

security/security.c

+2 −2
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ static void __init do_security_initcalls(void) 
	initcall_t call;

	initcall_entry_t *ce;



	ce = __security_initcall_start;

	ce = __start_lsm_info;

	trace_initcall_level("security");

	while (ce < __security_initcall_end) {

	while (ce < __end_lsm_info) {

		call = initcall_from_entry(ce);

		trace_initcall_start(call);

		ret = call();

CRA Git | Maintained and supported by SUSTech CRA and CCSE