1. 11 Feb, 2009 2 commits
  2. 06 Feb, 2009 1 commit
    • James Morris's avatar
      Merge branch 'master' into next · cb5629b1
      James Morris authored
      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: default avatarJames Morris <jmorris@namei.org>
      cb5629b1
  3. 05 Feb, 2009 34 commits
  4. 04 Feb, 2009 3 commits