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: Prarit Bhargava <prarit@redhat.com> Acked-by: David Howells <dhowells@redhat.com> [PM: wrapped description for checkpatch.pl, use "selinux:..." as subj] Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Родитель
61d612ea73
Коммит
0fd71a620b
|
@ -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
|
||||
|
|
|
@ -2696,7 +2696,7 @@ out:
|
|||
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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче