Commit 6a9e261c authored by Paul Moore's avatar Paul Moore
Browse files

selinux: don't sleep when CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE is true 



Unfortunately commit 81200b02 ("selinux: checkreqprot is
deprecated, add some ssleep() discomfort") added a five second sleep
during early kernel boot, e.g. start_kernel(), which could cause a
"scheduling while atomic" panic.  This patch fixes this problem by
moving the sleep out of checkreqprot_set() and into
sel_write_checkreqprot() so that we only sleep when the checkreqprot
setting is set during runtime, after the kernel has booted.  The
error message remains the same in both cases.

Fixes: 81200b02 ("selinux: checkreqprot is deprecated, add some ssleep() discomfort")
Reported-by: default avatarJ. Bruce Fields <bfields@fieldses.org>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 81200b02

security/selinux/include/security.h

+1 −3
Original line number Diff line number Diff line
@@ -152,10 +152,8 @@ static inline bool checkreqprot_get(const struct selinux_state *state) 


static inline void checkreqprot_set(struct selinux_state *state, bool value)

{

	if (value) {

	if (value)

		pr_err("SELinux: https://github.com/SELinuxProject/selinux-kernel/wiki/DEPRECATE-checkreqprot\n");

		ssleep(5);

	}

	WRITE_ONCE(state->checkreqprot, value);

}

security/selinux/selinuxfs.c

+2 −0
Original line number Diff line number Diff line
@@ -762,6 +762,8 @@ static ssize_t sel_write_checkreqprot(struct file *file, const char __user *buf, 
	}



	checkreqprot_set(fsi->state, (new_value ? 1 : 0));

	if (new_value)

		ssleep(5);

	length = count;



	selinux_ima_measure_state(fsi->state);