diff options
author | Tobias Klauser <tklauser@nuerscht.ch> | 2006-01-06 03:11:23 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:29 -0500 |
commit | 32725ad8430b58e42c5d54757ce7871e680d05cb (patch) | |
tree | f1e08edf1e154ef3f64b9d1c6cb88e2c6b0b5d22 | |
parent | 6e20a64a3913819133fefeca466211c7eb8adda1 (diff) |
[PATCH] selinux: more ARRAY_SIZE cleanups
Further ARRAY_SIZE cleanups under security/selinux.
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | security/selinux/ss/avtab.c | 2 | ||||
-rw-r--r-- | security/selinux/ss/policydb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c index dde094feb20d..d049c7acbc8b 100644 --- a/security/selinux/ss/avtab.c +++ b/security/selinux/ss/avtab.c | |||
@@ -359,7 +359,7 @@ int avtab_read_item(void *fp, u32 vers, struct avtab *a, | |||
359 | return -1; | 359 | return -1; |
360 | } | 360 | } |
361 | 361 | ||
362 | for (i = 0; i < sizeof(spec_order)/sizeof(u16); i++) { | 362 | for (i = 0; i < ARRAY_SIZE(spec_order); i++) { |
363 | if (val & spec_order[i]) { | 363 | if (val & spec_order[i]) { |
364 | key.specified = spec_order[i] | enabled; | 364 | key.specified = spec_order[i] | enabled; |
365 | datum.data = le32_to_cpu(buf32[items++]); | 365 | datum.data = le32_to_cpu(buf32[items++]); |
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 0ac311dc8371..0111990ba837 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c | |||
@@ -103,7 +103,7 @@ static struct policydb_compat_info *policydb_lookup_compat(int version) | |||
103 | int i; | 103 | int i; |
104 | struct policydb_compat_info *info = NULL; | 104 | struct policydb_compat_info *info = NULL; |
105 | 105 | ||
106 | for (i = 0; i < sizeof(policydb_compat)/sizeof(*info); i++) { | 106 | for (i = 0; i < ARRAY_SIZE(policydb_compat); i++) { |
107 | if (policydb_compat[i].version == version) { | 107 | if (policydb_compat[i].version == version) { |
108 | info = &policydb_compat[i]; | 108 | info = &policydb_compat[i]; |
109 | break; | 109 | break; |