From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>, Miklos Szeredi <miklos@szeredi•hu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Miklos Szeredi <mszeredi@redhat•com>
Subject: linux-next: manual merge of the vfs tree with the overlayfs tree
Date: Mon, 25 Jul 2016 10:24:53 +1000 [thread overview]
Message-ID: <20160725102453.7fbe3ddd@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/overlayfs/super.c
between commit:
e2475b7276d0 ("ovl: check mounter creds on underlying lookup")
from the overlayfs tree and commit:
b3ac9a85b31c ("qstr: constify instances in overlayfs")
from the vfs tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/overlayfs/super.c
index 4c91d9ed4689,bc10c261a006..000000000000
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@@ -419,21 -423,12 +419,21 @@@ static bool ovl_dentry_weird(struct den
DCACHE_OP_COMPARE);
}
-static inline struct dentry *ovl_lookup_real(struct dentry *dir,
+static inline struct dentry *ovl_lookup_real(struct super_block *ovl_sb,
+ struct dentry *dir,
- struct qstr *name)
+ const struct qstr *name)
{
+ const struct cred *old_cred;
struct dentry *dentry;
+ int err;
- dentry = lookup_hash(name, dir);
+ old_cred = ovl_override_creds(ovl_sb);
+ err = inode_permission(dir->d_inode, MAY_EXEC);
+ if (err)
+ dentry = ERR_PTR(err);
+ else
+ dentry = lookup_hash(name, dir);
+ revert_creds(old_cred);
if (IS_ERR(dentry)) {
if (PTR_ERR(dentry) == -ENOENT)
next reply other threads:[~2016-07-25 0:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-25 0:24 Stephen Rothwell [this message]
2016-07-25 0:30 ` linux-next: manual merge of the vfs tree with the overlayfs tree Al Viro
2016-07-25 8:09 ` Miklos Szeredi
-- strict thread matches above, loose matches on Subject: below --
2021-04-12 2:03 Stephen Rothwell
2018-07-10 0:22 Stephen Rothwell
2018-07-10 0:17 Stephen Rothwell
2018-07-10 15:04 ` Al Viro
2018-07-11 2:11 ` Al Viro
2018-06-19 1:21 Stephen Rothwell
2018-06-19 8:40 ` David Howells
2018-06-19 13:38 ` Miklos Szeredi
2018-06-19 1:10 Stephen Rothwell
2018-05-29 1:30 Stephen Rothwell
2018-06-05 0:19 ` Stephen Rothwell
2018-06-18 3:43 ` Stephen Rothwell
2018-01-25 3:31 Stephen Rothwell
2018-01-25 3:39 ` Stephen Rothwell
2018-01-31 23:25 ` Stephen Rothwell
2017-11-08 23:18 Stephen Rothwell
2016-12-11 23:13 Stephen Rothwell
2016-12-11 23:08 Stephen Rothwell
2016-10-10 0:20 Stephen Rothwell
2016-05-10 23:20 Stephen Rothwell
2016-05-02 0:59 Stephen Rothwell
2016-05-02 1:08 ` Al Viro
2016-05-02 1:23 ` Al Viro
2016-05-02 8:30 ` Miklos Szeredi
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=20160725102453.7fbe3ddd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=mszeredi@redhat$(echo .)com \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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