diff options
-rw-r--r-- | security/tomoyo/gc.c | 7 | ||||
-rw-r--r-- | security/tomoyo/util.c | 11 |
2 files changed, 18 insertions, 0 deletions
diff --git a/security/tomoyo/gc.c b/security/tomoyo/gc.c index c3214b32dbfb..986a6a756868 100644 --- a/security/tomoyo/gc.c +++ b/security/tomoyo/gc.c | |||
@@ -221,6 +221,13 @@ static void tomoyo_del_acl(struct list_head *element) | |||
221 | tomoyo_put_name_union(&entry->name); | 221 | tomoyo_put_name_union(&entry->name); |
222 | } | 222 | } |
223 | break; | 223 | break; |
224 | case TOMOYO_TYPE_MANUAL_TASK_ACL: | ||
225 | { | ||
226 | struct tomoyo_task_acl *entry = | ||
227 | container_of(acl, typeof(*entry), head); | ||
228 | tomoyo_put_name(entry->domainname); | ||
229 | } | ||
230 | break; | ||
224 | } | 231 | } |
225 | } | 232 | } |
226 | 233 | ||
diff --git a/security/tomoyo/util.c b/security/tomoyo/util.c index 50e9b4c73ceb..4a9b4b2eb755 100644 --- a/security/tomoyo/util.c +++ b/security/tomoyo/util.c | |||
@@ -1057,6 +1057,17 @@ bool tomoyo_domain_quota_is_ok(struct tomoyo_request_info *r) | |||
1057 | perm = container_of(ptr, struct tomoyo_mkdev_acl, | 1057 | perm = container_of(ptr, struct tomoyo_mkdev_acl, |
1058 | head)->perm; | 1058 | head)->perm; |
1059 | break; | 1059 | break; |
1060 | case TOMOYO_TYPE_INET_ACL: | ||
1061 | perm = container_of(ptr, struct tomoyo_inet_acl, | ||
1062 | head)->perm; | ||
1063 | break; | ||
1064 | case TOMOYO_TYPE_UNIX_ACL: | ||
1065 | perm = container_of(ptr, struct tomoyo_unix_acl, | ||
1066 | head)->perm; | ||
1067 | break; | ||
1068 | case TOMOYO_TYPE_MANUAL_TASK_ACL: | ||
1069 | perm = 0; | ||
1070 | break; | ||
1060 | default: | 1071 | default: |
1061 | perm = 1; | 1072 | perm = 1; |
1062 | } | 1073 | } |