[PATCH] security/selinux/*: use ARRAY_SIZE Signed-off-by: Tobias Klauser Signed-off-by: Alexey Dobriyan Index: linux-kj/security/selinux/selinuxfs.c =================================================================== --- linux-kj.orig/security/selinux/selinuxfs.c 2005-12-05 13:18:06.000000000 +0300 +++ linux-kj/security/selinux/selinuxfs.c 2005-12-05 13:19:25.000000000 +0300 @@ -376,7 +376,7 @@ static ssize_t selinux_transaction_write char *data; ssize_t rv; - if (ino >= sizeof(write_op)/sizeof(write_op[0]) || !write_op[ino]) + if (ino >= ARRAY_SIZE(write_op) || !write_op[ino]) return -EINVAL; data = simple_transaction_get(file, buf, size); @@ -1161,7 +1161,7 @@ static int sel_make_avc_files(struct den #endif }; - for (i = 0; i < sizeof (files) / sizeof (files[0]); i++) { + for (i = 0; i < ARRAY_SIZE(files); i++) { struct inode *inode; struct dentry *dentry; Index: linux-kj/security/selinux/ss/avtab.c =================================================================== --- linux-kj.orig/security/selinux/ss/avtab.c 2005-12-05 13:18:06.000000000 +0300 +++ linux-kj/security/selinux/ss/avtab.c 2005-12-05 13:19:25.000000000 +0300 @@ -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++]); Index: linux-kj/security/selinux/ss/policydb.c =================================================================== --- linux-kj.orig/security/selinux/ss/policydb.c 2005-12-05 13:18:06.000000000 +0300 +++ linux-kj/security/selinux/ss/policydb.c 2005-12-05 13:19:25.000000000 +0300 @@ -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;