lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 19 May 2021 00:48:57 +0000 From: Al Viro <viro@...iv.linux.org.uk> To: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Jia He <justin.he@....com>, Petr Mladek <pmladek@...e.com>, Steven Rostedt <rostedt@...dmis.org>, Sergey Senozhatsky <senozhatsky@...omium.org>, Andy Shevchenko <andriy.shevchenko@...ux.intel.com>, Rasmus Villemoes <linux@...musvillemoes.dk>, Jonathan Corbet <corbet@....net>, Heiko Carstens <hca@...ux.ibm.com>, Vasily Gorbik <gor@...ux.ibm.com>, Christian Borntraeger <borntraeger@...ibm.com>, "Eric W . Biederman" <ebiederm@...ssion.com>, "Darrick J. Wong" <darrick.wong@...cle.com>, "Peter Zijlstra (Intel)" <peterz@...radead.org>, Ira Weiny <ira.weiny@...el.com>, Eric Biggers <ebiggers@...gle.com>, "Ahmed S. Darwish" <a.darwish@...utronix.de>, "open list:DOCUMENTATION" <linux-doc@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, linux-s390 <linux-s390@...r.kernel.org>, linux-fsdevel <linux-fsdevel@...r.kernel.org> Subject: [PATCH 10/14] d_path: prepend_path(): get rid of vfsmnt it's kept equal to &mnt->mnt all along. Signed-off-by: Al Viro <viro@...iv.linux.org.uk> --- fs/d_path.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/fs/d_path.c b/fs/d_path.c index 06e93dd031bf..3836f5d0b023 100644 --- a/fs/d_path.c +++ b/fs/d_path.c @@ -90,7 +90,6 @@ static int prepend_path(const struct path *path, struct prepend_buffer *p) { struct dentry *dentry; - struct vfsmount *vfsmnt; struct mount *mnt; int error = 0; unsigned seq, m_seq = 0; @@ -105,18 +104,17 @@ static int prepend_path(const struct path *path, b = *p; error = 0; dentry = path->dentry; - vfsmnt = path->mnt; - mnt = real_mount(vfsmnt); + mnt = real_mount(path->mnt); read_seqbegin_or_lock(&rename_lock, &seq); - while (dentry != root->dentry || vfsmnt != root->mnt) { + while (dentry != root->dentry || &mnt->mnt != root->mnt) { struct dentry * parent; - if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) { + if (dentry == mnt->mnt.mnt_root || IS_ROOT(dentry)) { struct mount *parent = READ_ONCE(mnt->mnt_parent); struct mnt_namespace *mnt_ns; /* Escaped? */ - if (dentry != vfsmnt->mnt_root) { + if (dentry != mnt->mnt.mnt_root) { b = *p; error = 3; break; @@ -125,7 +123,6 @@ static int prepend_path(const struct path *path, if (mnt != parent) { dentry = READ_ONCE(mnt->mnt_mountpoint); mnt = parent; - vfsmnt = &mnt->mnt; continue; } mnt_ns = READ_ONCE(mnt->mnt_ns); -- 2.11.0
Powered by blists - more mailing lists