Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 650a8983 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds
Browse files

[PATCH] vfs: define new lookup flag for chdir 



In the "operation does permission checking" model used by fuse, chdir
permission is not checked, since there's no chdir method.

For this case set a lookup flag, which will be passed to ->permission(), so
fuse can distinguish it from permission checks for other operations.

Signed-off-by: default avatarMiklos Szeredi <miklos@szeredi.hu>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5b35e8e5

fs/fuse/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd) 
		if ((mask & MAY_EXEC) && !S_ISDIR(mode) && !(mode & S_IXUGO))

			return -EACCES;



		if (nd && (nd->flags & LOOKUP_ACCESS))

		if (nd && (nd->flags & (LOOKUP_ACCESS | LOOKUP_CHDIR)))

			return fuse_access(inode, mask);

		return 0;

	}

fs/open.c

+2 −1
Original line number Diff line number Diff line
@@ -546,7 +546,8 @@ asmlinkage long sys_chdir(const char __user * filename) 
	struct nameidata nd;

	int error;



	error = __user_walk(filename, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &nd);

	error = __user_walk(filename,

			    LOOKUP_FOLLOW|LOOKUP_DIRECTORY|LOOKUP_CHDIR, &nd);

	if (error)

		goto out;

include/linux/namei.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND}; 
#define LOOKUP_OPEN		(0x0100)

#define LOOKUP_CREATE		(0x0200)

#define LOOKUP_ACCESS		(0x0400)

#define LOOKUP_CHDIR		(0x0800)



extern int FASTCALL(__user_walk(const char __user *, unsigned, struct nameidata *));

extern int FASTCALL(__user_walk_fd(int dfd, const char __user *, unsigned, struct nameidata *));