From: James Morris <jmorris@namei.org>
Date: Tue, 9 Mar 2010 01:46:47 +0000 (+1100)
Subject: Merge branch 'next-queue' into next
X-Git-Tag: firefly_0821_release~9833^2~2102^2^2~57
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c43a7523470dc2d9947fa114a0b54317975d4c04;p=firefly-linux-kernel-4.4.55.git

Merge branch 'next-queue' into next
---

c43a7523470dc2d9947fa114a0b54317975d4c04
diff --cc security/tomoyo/common.c
index ff51f1026b57,be1099b3bb47..8ccf12997378
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@@ -1367,23 -1424,23 +1367,21 @@@ static bool tomoyo_print_path_acl(struc
  {
  	int pos;
  	u8 bit;
- 	const char *atmark = "";
  	const char *filename;
 -	const u16 perm = ptr->perm;
 +	const u32 perm = ptr->perm | (((u32) ptr->perm_high) << 16);
  
  	filename = ptr->filename->name;
 -	for (bit = head->read_bit; bit < TOMOYO_MAX_SINGLE_PATH_OPERATION;
 -	     bit++) {
 +	for (bit = head->read_bit; bit < TOMOYO_MAX_PATH_OPERATION; bit++) {
  		const char *msg;
  		if (!(perm & (1 << bit)))
  			continue;
  		/* Print "read/write" instead of "read" and "write". */
 -		if ((bit == TOMOYO_TYPE_READ_ACL ||
 -		     bit == TOMOYO_TYPE_WRITE_ACL)
 -		    && (perm & (1 << TOMOYO_TYPE_READ_WRITE_ACL)))
 +		if ((bit == TOMOYO_TYPE_READ || bit == TOMOYO_TYPE_WRITE)
 +		    && (perm & (1 << TOMOYO_TYPE_READ_WRITE)))
  			continue;
 -		msg = tomoyo_sp2keyword(bit);
 +		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;
@@@ -1402,12 -1459,11 +1400,10 @@@
   *
   * Returns true on success, false otherwise.
   */
 -static bool tomoyo_print_double_path_acl(struct tomoyo_io_buffer *head,
 -					 struct tomoyo_double_path_acl_record *
 -					 ptr)
 +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;
@@@ -1419,10 -1476,10 +1415,10 @@@
  		const char *msg;
  		if (!(perm & (1 << bit)))
  			continue;
 -		msg = tomoyo_dp2keyword(bit);
 +		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;