diff options
Diffstat (limited to 'security/selinux')
-rw-r--r-- | security/selinux/selinuxfs.c | 4 | ||||
-rw-r--r-- | security/selinux/ss/avtab.c | 2 | ||||
-rw-r--r-- | security/selinux/ss/policydb.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 0e1352a555c8..e59da6398d44 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
@@ -376,7 +376,7 @@ static ssize_t selinux_transaction_write(struct file *file, const char __user *b | |||
376 | char *data; | 376 | char *data; |
377 | ssize_t rv; | 377 | ssize_t rv; |
378 | 378 | ||
379 | if (ino >= sizeof(write_op)/sizeof(write_op[0]) || !write_op[ino]) | 379 | if (ino >= ARRAY_SIZE(write_op) || !write_op[ino]) |
380 | return -EINVAL; | 380 | return -EINVAL; |
381 | 381 | ||
382 | data = simple_transaction_get(file, buf, size); | 382 | data = simple_transaction_get(file, buf, size); |
@@ -1161,7 +1161,7 @@ static int sel_make_avc_files(struct dentry *dir) | |||
1161 | #endif | 1161 | #endif |
1162 | }; | 1162 | }; |
1163 | 1163 | ||
1164 | for (i = 0; i < sizeof (files) / sizeof (files[0]); i++) { | 1164 | for (i = 0; i < ARRAY_SIZE(files); i++) { |
1165 | struct inode *inode; | 1165 | struct inode *inode; |
1166 | struct dentry *dentry; | 1166 | struct dentry *dentry; |
1167 | 1167 | ||
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; |