[patch 2/2] selinux: ARRAY_SIZE cleanups
From: Stephen Smalley
Date: Mon Dec 05 2005 - 09:57:03 EST
From: Tobias Klauser <tklauser@xxxxxxxxxxx>
Further ARRAY_SIZE cleanups under security/selinux.
Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxxx>
Signed-off-by: Stephen Smalley <sds@xxxxxxxxxxxxx>
---
security/selinux/ss/avtab.c | 2 +-
security/selinux/ss/policydb.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -X /home/sds/dontdiff -rup a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c
--- a/security/selinux/ss/avtab.c 2005-10-27 20:02:08.000000000 -0400
+++ b/security/selinux/ss/avtab.c 2005-12-05 09:12:00.000000000 -0500
@@ -359,7 +359,7 @@ int avtab_read_item(void *fp, u32 vers,
return -1;
}
- for (i = 0; i < sizeof(spec_order)/sizeof(u16); i++) {
+ for (i = 0; i < ARRAY_SIZE(spec_order); i++) {
if (val & spec_order[i]) {
key.specified = spec_order[i] | enabled;
datum.data = le32_to_cpu(buf32[items++]);
diff -X /home/sds/dontdiff -rup a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
--- a/security/selinux/ss/policydb.c 2005-12-05 09:06:40.000000000 -0500
+++ b/security/selinux/ss/policydb.c 2005-12-05 09:12:00.000000000 -0500
@@ -103,7 +103,7 @@ static struct policydb_compat_info *poli
int i;
struct policydb_compat_info *info = NULL;
- for (i = 0; i < sizeof(policydb_compat)/sizeof(*info); i++) {
+ for (i = 0; i < ARRAY_SIZE(policydb_compat); i++) {
if (policydb_compat[i].version == version) {
info = &policydb_compat[i];
break;
--
Stephen Smalley
National Security Agency
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/