diff options
Diffstat (limited to 'security/selinux/selinuxfs.c')
| -rw-r--r-- | security/selinux/selinuxfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 0e1352a555c8..b5fa02d17b1e 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); |
| @@ -889,7 +889,7 @@ static void sel_remove_bools(struct dentry *de) | |||
| 889 | spin_lock(&dcache_lock); | 889 | spin_lock(&dcache_lock); |
| 890 | node = de->d_subdirs.next; | 890 | node = de->d_subdirs.next; |
| 891 | while (node != &de->d_subdirs) { | 891 | while (node != &de->d_subdirs) { |
| 892 | struct dentry *d = list_entry(node, struct dentry, d_child); | 892 | struct dentry *d = list_entry(node, struct dentry, d_u.d_child); |
| 893 | list_del_init(node); | 893 | list_del_init(node); |
| 894 | 894 | ||
| 895 | if (d->d_inode) { | 895 | if (d->d_inode) { |
| @@ -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 | ||
