[PATCH] vfs: Partially revert addition of cred override in follow_automount()

From: David Howells
Date: Wed Feb 22 2017 - 08:36:47 EST

The following commit:

commit aeaa4a79ff6a5ed912b7362f206cf8576fca538b
Author: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Date: Sat Jul 23 11:20:44 2016 -0500
fs: Call d_automount with the filesystems creds

brackets the call to ->d_automount() with override_creds() and
revert_creds(), setting the initial credentials for use whilst

This, however, breaks AFS as it's no longer able to access the calling
process's keyrings to read the destination on a mountpoint. This has gone
unnoticed till now because, to this point, stat'ing or validating the inode
caused the body of the mountpoint to be read into the pagecache (so that we
could determine whether what we were looking at was really a mountpoint).

However, the page containing the mountpoint destination is merely *cached*
and not pinned. If it gets discarded and we try to read it in d_automount,
we may fail because we have no authentication tokens available.

So, for the moment, revert the addition of override_creds() and
revert_creds() and their variable.

Fixes: aeaa4a79ff6a ("fs: Call d_automount with the filesystems creds")
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
cc: Seth Forshee <seth.forshee@xxxxxxxxxxxxx>
cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

fs/namei.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index ad74877e1442..dff5cd3b556f 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1100,7 +1100,6 @@ static int follow_automount(struct path *path, struct nameidata *nd,
bool *need_mntput)
struct vfsmount *mnt;
- const struct cred *old_cred;
int err;

if (!path->dentry->d_op || !path->dentry->d_op->d_automount)
@@ -1129,9 +1128,7 @@ static int follow_automount(struct path *path, struct nameidata *nd,
if (nd->total_link_count >= 40)
return -ELOOP;

- old_cred = override_creds(&init_cred);
mnt = path->dentry->d_op->d_automount(path);
- revert_creds(old_cred);
if (IS_ERR(mnt)) {
* The filesystem is allowed to return -EISDIR here to indicate