Commit c867248c authored by Christian Göttsche's avatar Christian Göttsche Committed by Paul Moore
Browse files

selinux: avoid implicit conversions regarding enforcing status 



Use the type bool as parameter type in
selinux_status_update_setenforce().  The related function
enforcing_enabled() returns the type bool, while the struct
selinux_kernel_status member enforcing uses an u32.

Signed-off-by: default avatarChristian Göttsche <cgzones@googlemail.com>
[PM: subject line tweaks]
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 0e83c9c6

security/selinux/include/security.h

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ struct selinux_kernel_status { 
	 */

} __packed;



extern void selinux_status_update_setenforce(int enforcing);

extern void selinux_status_update_setenforce(bool enforcing);

extern void selinux_status_update_policyload(u32 seqno);

extern void selinux_complete_init(void);

extern struct path selinux_null;

security/selinux/selinuxfs.c

+4 −3
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ static ssize_t sel_write_enforce(struct file *file, const char __user *buf, 
{

	char *page = NULL;

	ssize_t length;

	int old_value, new_value;

	int scan_value;

	bool old_value, new_value;



	if (count >= PAGE_SIZE)

		return -ENOMEM;
@@ -152,10 +153,10 @@ static ssize_t sel_write_enforce(struct file *file, const char __user *buf, 
		return PTR_ERR(page);



	length = -EINVAL;

	if (sscanf(page, "%d", &new_value) != 1)

	if (sscanf(page, "%d", &scan_value) != 1)

		goto out;



	new_value = !!new_value;

	new_value = !!scan_value;



	old_value = enforcing_enabled();

	if (new_value != old_value) {

security/selinux/status.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ struct page *selinux_kernel_status_page(void) 
 *

 * It updates status of the current enforcing/permissive mode.

 */

void selinux_status_update_setenforce(int enforcing)

void selinux_status_update_setenforce(bool enforcing)

{

	struct selinux_kernel_status   *status;
@@ -87,7 +87,7 @@ void selinux_status_update_setenforce(int enforcing) 
		status->sequence++;

		smp_wmb();



		status->enforcing = enforcing;

		status->enforcing = enforcing ? 1 : 0;



		smp_wmb();

		status->sequence++;