---

yaml --- r: 264559 b: refs/heads/master c: 545a726 h: refs/heads/master i: 264557: 866f3d4 264555: 8695f4e 264551: bc719f8 264543: 8a5b7b2 v: v3
git-mirror · Oct 12, 2011 · b92e687 · b92e687
1 parent 7bd576f
commit b92e687
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;
 		}