diff options
| author |   Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2010-06-12 20:46:22 +0900 |
|---|---|---|
| committer |   James Morris <jmorris@namei.org> | 2010-08-02 15:34:28 +1000 |
| commit | 237ab459f12cb98eadd3fe7b85343e183a1076a4 (patch) | |
| tree | f2835e2945016beb4e29b6a2ed8f9d372dc1b412 /security/tomoyo/util.c | |
| parent | KEYS: Make /proc/keys check to see if a key is possessed before security check (diff) | |
| download | linux-dev-237ab459f12cb98eadd3fe7b85343e183a1076a4.tar.xz linux-dev-237ab459f12cb98eadd3fe7b85343e183a1076a4.zip | |
TOMOYO: Use callback for updating entries.
Use common "struct list_head" + "bool" + "u8" structure and
use common code for elements using that structure.
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/tomoyo/util.c')
| -rw-r--r-- | security/tomoyo/util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/tomoyo/util.c b/security/tomoyo/util.c index 307793ed6075..e5931686ca33 100644 --- a/security/tomoyo/util.c +++ b/security/tomoyo/util.c @@ -911,6 +911,8 @@ bool tomoyo_domain_quota_is_ok(struct tomoyo_request_info *r) if (!domain) return true; list_for_each_entry_rcu(ptr, &domain->acl_info_list, list) { + if (!ptr->is_deleted) + continue; switch (ptr->type) { u16 perm; u8 i; @@ -944,10 +946,8 @@ bool tomoyo_domain_quota_is_ok(struct tomoyo_request_info *r) if (perm & (1 << i)) count++; break; - case TOMOYO_TYPE_MOUNT_ACL: - if (!container_of(ptr, struct tomoyo_mount_acl, head)-> - is_deleted) - count++; + default: + count++; } } if (count < tomoyo_profile(domain->profile)->learning-> |