summaryrefslogtreecommitdiff
path: root/security/tomoyo/file.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-12-09 11:01:03 +0300
committerJames Morris <jmorris@namei.org>2009-12-09 11:01:03 +0300
commit1ad1f10cd915744bbe52b19423653b38287d827d (patch)
treeae072aace36b45a55d80b8cbf1b6d92523a88ea0 /security/tomoyo/file.c
parent08e3daff217059c84c360cc71212686e0a7995af (diff)
parent2b876f95d03e226394b5d360c86127cbefaf614b (diff)
downloadlinux-1ad1f10cd915744bbe52b19423653b38287d827d.tar.xz
Merge branch 'master' into next
Diffstat (limited to 'security/tomoyo/file.c')
-rw-r--r--security/tomoyo/file.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
index 2d10f98fc551..482f0e7ed997 100644
--- a/security/tomoyo/file.c
+++ b/security/tomoyo/file.c
@@ -1118,27 +1118,6 @@ static int tomoyo_check_single_path_permission2(struct tomoyo_domain_info *
}
/**
- * tomoyo_check_file_perm - Check permission for sysctl()'s "read" and "write".
- *
- * @domain: Pointer to "struct tomoyo_domain_info".
- * @filename: Filename to check.
- * @perm: Mode ("read" or "write" or "read/write").
- * Returns 0 on success, negative value otherwise.
- */
-int tomoyo_check_file_perm(struct tomoyo_domain_info *domain,
- const char *filename, const u8 perm)
-{
- struct tomoyo_path_info name;
- const u8 mode = tomoyo_check_flags(domain, TOMOYO_MAC_FOR_FILE);
-
- if (!mode)
- return 0;
- name.name = filename;
- tomoyo_fill_path_info(&name);
- return tomoyo_check_file_perm2(domain, &name, perm, "sysctl", mode);
-}
-
-/**
* tomoyo_check_exec_perm - Check permission for "execute".
*
* @domain: Pointer to "struct tomoyo_domain_info".