Files
kernel_amazon_mt8127-common/include/linux
James Morris cb5629b10d Merge branch 'master' into next
Conflicts:
	fs/namei.c

Manually merged per:

diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char
  		nd->flags |= LOOKUP_CONTINUE;
  		err = exec_permission_lite(inode);
  		if (err == -EAGAIN)
- 			err = vfs_permission(nd, MAY_EXEC);
+ 			err = inode_permission(nd->path.dentry->d_inode,
+ 					       MAY_EXEC);
 +		if (!err)
 +			err = ima_path_check(&nd->path, MAY_EXEC);
   		if (err)
  			break;

@@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc
  		flag &= ~O_TRUNC;
  	}

- 	error = vfs_permission(nd, acc_mode);
+ 	error = inode_permission(inode, acc_mode);
  	if (error)
  		return error;
 +
- 	error = ima_path_check(&nd->path,
++	error = ima_path_check(path,
 +			       acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
 +	if (error)
 +		return error;
  	/*
  	 * An append-only file must be opened in append mode for writing.
  	 */

Signed-off-by: James Morris <jmorris@namei.org>
2009-02-06 11:01:45 +11:00
..
2009-01-30 19:50:25 +05:30
2009-01-30 19:59:53 +05:30
2009-01-11 01:34:25 +01:00
2009-01-09 12:37:15 -08:00
2009-01-30 23:30:42 +05:30
2009-01-30 23:32:45 +05:30
2009-01-30 23:33:12 +05:30
2009-01-30 23:37:37 +05:30
2009-01-30 23:38:03 +05:30
2009-02-02 22:45:10 -05:00
2009-01-30 23:38:37 +05:30
2009-02-06 11:01:45 +11:00
2009-01-30 23:39:42 +05:30
2009-01-30 23:40:06 +05:30
2009-01-06 15:59:29 -08:00
2009-01-30 23:44:08 +05:30
2009-01-28 07:50:14 -08:00
2009-01-30 23:46:03 +05:30
2009-01-30 23:46:40 +05:30
2009-01-30 23:48:33 +05:30
2009-01-30 23:49:07 +05:30
2009-01-06 15:59:01 -08:00
2009-01-30 23:50:37 +05:30
2009-01-30 23:51:17 +05:30
2009-01-26 21:19:52 +01:00
2009-01-30 23:51:41 +05:30
2009-01-30 23:52:16 +05:30
2009-01-30 23:53:12 +05:30
2009-01-30 23:53:40 +05:30
2009-01-30 23:54:53 +05:30
2009-01-30 23:55:45 +05:30
2009-01-30 23:56:13 +05:30
2009-01-30 23:56:48 +05:30
2009-01-06 10:50:09 -08:00
2009-01-30 23:57:16 +05:30
2009-02-06 09:05:33 +11:00
2009-01-30 23:58:41 +05:30
2009-01-30 23:59:44 +05:30
2009-01-31 00:00:06 +05:30
2009-01-15 16:39:37 -08:00
2009-01-31 00:00:35 +05:30
2009-01-14 07:32:44 -08:00
2009-01-08 08:31:07 -08:00
2009-01-31 00:01:11 +05:30
2009-01-07 17:38:31 -05:00
2009-01-31 00:15:24 +05:30
2009-01-08 08:31:05 -08:00
2009-01-31 00:02:54 +05:30
2009-01-08 08:31:12 -08:00
2009-01-31 00:03:40 +05:30
2009-01-06 10:44:30 -08:00
2009-01-06 15:59:12 -08:00
2009-01-31 00:05:30 +05:30
2009-01-16 18:02:10 +01:00
2009-01-31 00:05:59 +05:30
2009-01-07 09:58:22 +11:00
2009-01-31 00:06:33 +05:30
2009-01-31 00:07:00 +05:30
2009-01-08 08:31:10 -08:00
2009-01-31 00:07:31 +05:30
2009-01-29 18:04:44 -08:00
2009-02-03 11:23:12 +11:00
2009-01-31 00:10:59 +05:30
2009-01-06 15:59:09 -08:00