aboutsummaryrefslogtreecommitdiffstats
path: root/security/tomoyo/common.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-03-09 12:46:47 +1100
committerJames Morris <jmorris@namei.org>2010-03-09 12:46:47 +1100
commitc43a7523470dc2d9947fa114a0b54317975d4c04 (patch)
tree30a72ed1e9079f19b814263197761820f57c39ce /security/tomoyo/common.c
parenteaa5eec739637f32f8733d528ff0b94fd62b1214 (diff)
parent634a539e16bd7a1ba31c3f832baa725565cc9f96 (diff)
downloadmrst-s0i3-test-c43a7523470dc2d9947fa114a0b54317975d4c04.tar.gz
mrst-s0i3-test-c43a7523470dc2d9947fa114a0b54317975d4c04.tar.xz
mrst-s0i3-test-c43a7523470dc2d9947fa114a0b54317975d4c04.zip
Merge branch 'next-queue' into next
Diffstat (limited to 'security/tomoyo/common.c')
-rw-r--r--security/tomoyo/common.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index ff51f1026b5..8ccf1299737 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -1367,7 +1367,6 @@ static bool tomoyo_print_path_acl(struct tomoyo_io_buffer *head,
{
int pos;
u8 bit;
- const char *atmark = "";
const char *filename;
const u32 perm = ptr->perm | (((u32) ptr->perm_high) << 16);
@@ -1382,8 +1381,7 @@ static bool tomoyo_print_path_acl(struct tomoyo_io_buffer *head,
continue;
msg = tomoyo_path2keyword(bit);
pos = head->read_avail;
- if (!tomoyo_io_printf(head, "allow_%s %s%s\n", msg,
- atmark, filename))
+ if (!tomoyo_io_printf(head, "allow_%s %s\n", msg, filename))
goto out;
}
head->read_bit = 0;
@@ -1406,8 +1404,6 @@ static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
struct tomoyo_path2_acl *ptr)
{
int pos;
- const char *atmark1 = "";
- const char *atmark2 = "";
const char *filename1;
const char *filename2;
const u8 perm = ptr->perm;
@@ -1421,8 +1417,8 @@ static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
continue;
msg = tomoyo_path22keyword(bit);
pos = head->read_avail;
- if (!tomoyo_io_printf(head, "allow_%s %s%s %s%s\n", msg,
- atmark1, filename1, atmark2, filename2))
+ if (!tomoyo_io_printf(head, "allow_%s %s %s\n", msg,
+ filename1, filename2))
goto out;
}
head->read_bit = 0;