From: Andrey Vagin <avagin@openvz.org>
To: linux-fsdevel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, criu@openvz.org,
containers@lists.linux-foundation.org,
Alexander Viro <viro@zeniv.linux.org.uk>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Arnd Bergmann <arnd@arndb.de>,
"J. Bruce Fields" <bfields@redhat.com>,
Miklos Szeredi <mszeredi@redhat.com>, NeilBrown <neilb@suse.de>,
Shuah Khan <shuahkh@osg.samsung.com>,
Omar Sandoval <osandov@osandov.com>,
Andrey Vagin <avagin@openvz.org>
Subject: [PATCH 1/3 v2] namei: add LOOKUP_DFD_ROOT to use dfd as root
Date: Tue, 5 Jul 2016 14:26:58 -0700 [thread overview]
Message-ID: <1467754018-29203-1-git-send-email-avagin@openvz.org> (raw)
In-Reply-To: <20160702005525.GA28451@vader.dhcp.thefacebook.com>
The problem is that a pathname can contain absolute symlinks and now
they are resolved relative to the current root.
If we want to open a file in another mount namespaces and we have a file
descriptor to its root directory, we probably want to resolve pathname
in the target mount namespace. For this we add this new flag.
If LOOKUP_DFD_ROOT is set, path_init() initializes nd->root and nd->path
to the same value.
Changes since v1:
* initialize nd->root_seq (thanks to Omar Sandoval for reporting and
fixing this issue)
Cc: Omar Sandoval <osandov@osandov.com>
Signed-off-by: Andrey Vagin <avagin@openvz.org>
---
fs/namei.c | 16 +++++++++++++++-
include/linux/namei.h | 2 ++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/fs/namei.c b/fs/namei.c
index 70580ab..d52541a 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2148,7 +2148,7 @@ static const char *path_init(struct nameidata *nd, unsigned flags)
nd->path.dentry = NULL;
nd->m_seq = read_seqbegin(&mount_lock);
- if (*s == '/') {
+ if (*s == '/' && !(flags & LOOKUP_DFD_ROOT)) {
if (flags & LOOKUP_RCU)
rcu_read_lock();
set_root(nd);
@@ -2174,6 +2174,13 @@ static const char *path_init(struct nameidata *nd, unsigned flags)
get_fs_pwd(current->fs, &nd->path);
nd->inode = nd->path.dentry->d_inode;
}
+ if (flags & LOOKUP_DFD_ROOT) {
+ nd->root = nd->path;
+ if (flags & LOOKUP_RCU)
+ nd->root_seq = nd->seq;
+ else
+ path_get(&nd->root);
+ }
return s;
} else {
/* Caller must check execute permissions on the starting path component */
@@ -2202,6 +2209,13 @@ static const char *path_init(struct nameidata *nd, unsigned flags)
nd->inode = nd->path.dentry->d_inode;
}
fdput(f);
+ if (flags & LOOKUP_DFD_ROOT) {
+ nd->root = nd->path;
+ if (flags & LOOKUP_RCU)
+ nd->root_seq = nd->seq;
+ else
+ path_get(&nd->root);
+ }
return s;
}
}
diff --git a/include/linux/namei.h b/include/linux/namei.h
index d3d0398..ca2ea13 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -45,6 +45,8 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
#define LOOKUP_ROOT 0x2000
#define LOOKUP_EMPTY 0x4000
+#define LOOKUP_DFD_ROOT 0x8000
+
extern int path_pts(struct path *path);
extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty);
--
2.5.5
next prev parent reply other threads:[~2016-07-05 21:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-28 17:38 [PATCH 0/3 v2] fs: allow to use dirfd as root for openat and other *at syscalls Andrey Vagin
2016-06-28 17:38 ` [PATCH 1/3] namei: add LOOKUP_DFD_ROOT to use dfd as root Andrey Vagin
2016-07-02 0:55 ` Omar Sandoval
2016-07-05 21:26 ` Andrey Vagin [this message]
2016-07-05 21:36 ` Andrey Vagin
2016-06-28 17:38 ` [PATCH 2/3] fs: allow to use dirfd as root for openat and other *at syscalls Andrey Vagin
2016-06-28 17:38 ` [PATCH 3/3] selftests: check O_ATROOT and AT_FDROOT flags Andrey Vagin
2016-07-20 20:42 [PATCH 0/3 v3] fs: allow to use dirfd as root for openat and other *at syscalls Andrey Vagin
2016-07-20 20:42 ` [PATCH 1/3 v2] namei: add LOOKUP_DFD_ROOT to use dfd as root Andrey Vagin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467754018-29203-1-git-send-email-avagin@openvz.org \
--to=avagin@openvz.org \
--cc=arnd@arndb.de \
--cc=bfields@redhat.com \
--cc=containers@lists.linux-foundation.org \
--cc=criu@openvz.org \
--cc=ebiederm@xmission.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mszeredi@redhat.com \
--cc=neilb@suse.de \
--cc=osandov@osandov.com \
--cc=shuahkh@osg.samsung.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®