diff options
| author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2010-06-12 13:46:22 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-08-02 07:34:28 +0200 |
| commit | 237ab459f12cb98eadd3fe7b85343e183a1076a4 (patch) | |
| tree | f2835e2945016beb4e29b6a2ed8f9d372dc1b412 /security/tomoyo/common.c | |
| parent | KEYS: Make /proc/keys check to see if a key is possessed before security check (diff) | |
| download | linux-237ab459f12cb98eadd3fe7b85343e183a1076a4.tar.xz linux-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/common.c')
| -rw-r--r-- | security/tomoyo/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c index 811adb5e9fea..6556e5d27d74 100644 --- a/security/tomoyo/common.c +++ b/security/tomoyo/common.c @@ -950,8 +950,6 @@ static bool tomoyo_print_mount_acl(struct tomoyo_io_buffer *head, struct tomoyo_mount_acl *ptr) { const int pos = head->read_avail; - if (ptr->is_deleted) - return true; if (!tomoyo_io_printf(head, TOMOYO_KEYWORD_ALLOW_MOUNT) || !tomoyo_print_name_union(head, &ptr->dev_name) || !tomoyo_print_name_union(head, &ptr->dir_name) || @@ -977,6 +975,8 @@ static bool tomoyo_print_entry(struct tomoyo_io_buffer *head, { const u8 acl_type = ptr->type; + if (ptr->is_deleted) + return true; if (acl_type == TOMOYO_TYPE_PATH_ACL) { struct tomoyo_path_acl *acl = container_of(ptr, struct tomoyo_path_acl, head); |