aboutsummaryrefslogtreecommitdiffstats
path: root/security/tomoyo
diff options
context:
space:
mode:
Diffstat (limited to 'security/tomoyo')
-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 ff51f1026b57..8ccf12997378 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,
1367{ 1367{
1368 int pos; 1368 int pos;
1369 u8 bit; 1369 u8 bit;
1370 const char *atmark = "";
1371 const char *filename; 1370 const char *filename;
1372 const u32 perm = ptr->perm | (((u32) ptr->perm_high) << 16); 1371 const u32 perm = ptr->perm | (((u32) ptr->perm_high) << 16);
1373 1372
@@ -1382,8 +1381,7 @@ static bool tomoyo_print_path_acl(struct tomoyo_io_buffer *head,
1382 continue; 1381 continue;
1383 msg = tomoyo_path2keyword(bit); 1382 msg = tomoyo_path2keyword(bit);
1384 pos = head->read_avail; 1383 pos = head->read_avail;
1385 if (!tomoyo_io_printf(head, "allow_%s %s%s\n", msg, 1384 if (!tomoyo_io_printf(head, "allow_%s %s\n", msg, filename))
1386 atmark, filename))
1387 goto out; 1385 goto out;
1388 } 1386 }
1389 head->read_bit = 0; 1387 head->read_bit = 0;
@@ -1406,8 +1404,6 @@ static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
1406 struct tomoyo_path2_acl *ptr) 1404 struct tomoyo_path2_acl *ptr)
1407{ 1405{
1408 int pos; 1406 int pos;
1409 const char *atmark1 = "";
1410 const char *atmark2 = "";
1411 const char *filename1; 1407 const char *filename1;
1412 const char *filename2; 1408 const char *filename2;
1413 const u8 perm = ptr->perm; 1409 const u8 perm = ptr->perm;
@@ -1421,8 +1417,8 @@ static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
1421 continue; 1417 continue;
1422 msg = tomoyo_path22keyword(bit); 1418 msg = tomoyo_path22keyword(bit);
1423 pos = head->read_avail; 1419 pos = head->read_avail;
1424 if (!tomoyo_io_printf(head, "allow_%s %s%s %s%s\n", msg, 1420 if (!tomoyo_io_printf(head, "allow_%s %s %s\n", msg,
1425 atmark1, filename1, atmark2, filename2)) 1421 filename1, filename2))
1426 goto out; 1422 goto out;
1427 } 1423 }
1428 head->read_bit = 0; 1424 head->read_bit = 0;