From b92e687a052fb14a40f7b29b402a1abd519814cb Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Date: Tue, 11 Oct 2011 14:06:41 +0900
Subject: [PATCH] --- yaml --- r: 264559 b: refs/heads/master c:
 545a7260343bbaf11c7f1a4b8c3d9660bb9266e5 h: refs/heads/master i:   264557:
 866f3d471988eb7e5b08b52432e1ba5432b18f65   264555:
 8695f4eec473400340fccf288c592c38dab92394   264551:
 bc719f83446738332c311d8af75b12eb9e3c4438   264543:
 8a5b7b2e6b6cbf0cee33e2b021a58dadcc266ccf v: v3

---
 [refs]                       |  2 +-
 trunk/security/tomoyo/gc.c   |  7 +++++++
 trunk/security/tomoyo/util.c | 11 +++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3c02d3c09c89..487d8326cd55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2b8b25a6795488eba7bb757706b3ac725c31fac
+refs/heads/master: 545a7260343bbaf11c7f1a4b8c3d9660bb9266e5
diff --git a/trunk/security/tomoyo/gc.c b/trunk/security/tomoyo/gc.c
index c3214b32dbfb..986a6a756868 100644
--- a/trunk/security/tomoyo/gc.c
+++ b/trunk/security/tomoyo/gc.c
@@ -221,6 +221,13 @@ static void tomoyo_del_acl(struct list_head *element)
 			tomoyo_put_name_union(&entry->name);
 		}
 		break;
+	case TOMOYO_TYPE_MANUAL_TASK_ACL:
+		{
+			struct tomoyo_task_acl *entry =
+				container_of(acl, typeof(*entry), head);
+			tomoyo_put_name(entry->domainname);
+		}
+		break;
 	}
 }
 
diff --git a/trunk/security/tomoyo/util.c b/trunk/security/tomoyo/util.c
index 50e9b4c73ceb..4a9b4b2eb755 100644
--- a/trunk/security/tomoyo/util.c
+++ b/trunk/security/tomoyo/util.c
@@ -1057,6 +1057,17 @@ bool tomoyo_domain_quota_is_ok(struct tomoyo_request_info *r)
 			perm = container_of(ptr, struct tomoyo_mkdev_acl,
 					    head)->perm;
 			break;
+		case TOMOYO_TYPE_INET_ACL:
+			perm = container_of(ptr, struct tomoyo_inet_acl,
+					    head)->perm;
+			break;
+		case TOMOYO_TYPE_UNIX_ACL:
+			perm = container_of(ptr, struct tomoyo_unix_acl,
+					    head)->perm;
+			break;
+		case TOMOYO_TYPE_MANUAL_TASK_ACL:
+			perm = 0;
+			break;
 		default:
 			perm = 1;
 		}