From a906d3544053caaf4e28d38772ce2a99d794de70 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 16 Jul 2008 09:51:03 -0400
Subject: [PATCH] --- yaml --- r: 106361 b: refs/heads/master c:
 8bb79224b87aab92071e94d46e70bd160d89bf34 h: refs/heads/master i:   106359:
 3073a3397f815c6127419a224b98ba3f9b6b1288 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/namei.c            | 2 --
 trunk/fs/open.c             | 5 ++---
 trunk/include/linux/namei.h | 1 -
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9def2270d18e..92fe7a891a99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db2e747b14991a4c6a5c98b0e5f552a193237c03
+refs/heads/master: 8bb79224b87aab92071e94d46e70bd160d89bf34
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index ae0e56fdb742..6c76e1ee9c45 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -268,8 +268,6 @@ int permission(struct inode *inode, int mask, struct nameidata *nd)
 		if (nd) {
 			if (nd->flags & LOOKUP_ACCESS)
 				extra |= MAY_ACCESS;
-			if (nd->flags & LOOKUP_CHDIR)
-				extra |= MAY_CHDIR;
 			if (nd->flags & LOOKUP_OPEN)
 				extra |= MAY_OPEN;
 		}
diff --git a/trunk/fs/open.c b/trunk/fs/open.c
index b2e4c93aed03..8e02d42bfe44 100644
--- a/trunk/fs/open.c
+++ b/trunk/fs/open.c
@@ -501,12 +501,11 @@ asmlinkage long sys_chdir(const char __user * filename)
 	struct nameidata nd;
 	int error;
 
-	error = __user_walk(filename,
-			    LOOKUP_FOLLOW|LOOKUP_DIRECTORY|LOOKUP_CHDIR, &nd);
+	error = __user_walk(filename, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &nd);
 	if (error)
 		goto out;
 
-	error = vfs_permission(&nd, MAY_EXEC);
+	error = vfs_permission(&nd, MAY_EXEC | MAY_CHDIR);
 	if (error)
 		goto dput_and_out;
 
diff --git a/trunk/include/linux/namei.h b/trunk/include/linux/namei.h
index 24d88e98a626..3cf62d26d493 100644
--- a/trunk/include/linux/namei.h
+++ b/trunk/include/linux/namei.h
@@ -55,7 +55,6 @@ 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 __user_walk(const char __user *, unsigned, struct nameidata *);
 extern int __user_walk_fd(int dfd, const char __user *, unsigned, struct nameidata *);