Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fd71a62 authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Paul Moore
Browse files

selinux: Change bool variable name to index. 



security_get_bool_value(int bool) argument "bool" conflicts with
in-kernel macros such as BUILD_BUG().  This patch changes this to
index which isn't a type.

Cc: Paul Moore <paul@paul-moore.com>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: Eric Paris <eparis@parisplace.org>
Cc: James Morris <james.l.morris@oracle.com>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Andrew Perepechko <anserper@ya.ru>
Cc: Jeff Vander Stoep <jeffv@google.com>
Cc: selinux@tycho.nsa.gov
Cc: Eric Paris <eparis@redhat.com>
Cc: Paul Moore <pmoore@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarPrarit Bhargava <prarit@redhat.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
[PM: wrapped description for checkpatch.pl, use "selinux:..." as subj]
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 61d612ea

security/selinux/include/conditional.h

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ int security_get_bools(int *len, char ***names, int **values); 


int security_set_bools(int len, int *values);



int security_get_bool_value(int bool);

int security_get_bool_value(int index);



#endif

security/selinux/ss/services.c

+3 −3
Original line number Diff line number Diff line
@@ -2696,7 +2696,7 @@ int security_set_bools(int len, int *values) 
	return rc;

}



int security_get_bool_value(int bool)

int security_get_bool_value(int index)

{

	int rc;

	int len;
@@ -2705,10 +2705,10 @@ int security_get_bool_value(int bool) 


	rc = -EFAULT;

	len = policydb.p_bools.nprim;

	if (bool >= len)

	if (index >= len)

		goto out;



	rc = policydb.bool_val_to_struct[bool]->state;

	rc = policydb.bool_val_to_struct[index]->state;

out:

	read_unlock(&policy_rwlock);

	return rc;