From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <christian@brauner•io>,
Al Viro <viro@zeniv•linux.org.uk>
Cc: Christian Brauner <christian.brauner@ubuntu•com>,
Jens Axboe <axboe@kernel•dk>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Jens Axboe <axboe@kernel•dk>
Subject: Re: linux-next: manual merge of the pidfd tree with the vfs tree
Date: Mon, 15 Feb 2021 08:05:21 +1100 [thread overview]
Message-ID: <20210215080521.45f7a061@canb.auug.org.au> (raw)
In-Reply-To: <20210125170054.54869988@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2720 bytes --]
Hi all,
On Mon, 25 Jan 2021 17:00:54 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> fs/namei.c
>
> between commit:
>
> e36cffed20a3 ("fs: make unlazy_walk() error handling consistent")
> 1e8f44f159b3 ("do_tmpfile(): don't mess with finish_open()")
>
> from the vfs tree and commit:
>
> 47291baa8ddf ("namei: make permission helpers idmapped mount aware")
> ba73d98745be ("namei: handle idmapped mounts in may_*() helpers")
> 549c7297717c ("fs: make helpers idmap mount aware")
>
> from the pidfd 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.
>
> diff --cc fs/namei.c
> index 4cae88733a5c,dbf53b325ac9..000000000000
> --- a/fs/namei.c
> +++ b/fs/namei.c
> @@@ -1568,14 -1639,18 +1644,16 @@@ static struct dentry *lookup_slow(cons
> return res;
> }
>
> - static inline int may_lookup(struct nameidata *nd)
> + static inline int may_lookup(struct user_namespace *mnt_userns,
> + struct nameidata *nd)
> {
> if (nd->flags & LOOKUP_RCU) {
> - int err = inode_permission(nd->inode, MAY_EXEC|MAY_NOT_BLOCK);
> + int err = inode_permission(mnt_userns, nd->inode,
> + MAY_EXEC | MAY_NOT_BLOCK);
> - if (err != -ECHILD)
> + if (err != -ECHILD || !try_to_unlazy(nd))
> return err;
> - if (unlazy_walk(nd))
> - return -ECHILD;
> }
> - return inode_permission(nd->inode, MAY_EXEC);
> + return inode_permission(mnt_userns, nd->inode, MAY_EXEC);
> }
>
> static int reserve_stack(struct nameidata *nd, struct path *link, unsigned seq)
> @@@ -3324,9 -3453,11 +3453,9 @@@ static int do_tmpfile(struct nameidata
> path.dentry = child;
> audit_inode(nd->name, child, 0);
> /* Don't check for other permissions, the inode was just created */
> - error = may_open(&path, 0, op->open_flag);
> + error = may_open(mnt_userns, &path, 0, op->open_flag);
> - if (error)
> - goto out2;
> - file->f_path.mnt = path.mnt;
> - error = finish_open(file, child, NULL);
> + if (!error)
> + error = vfs_open(&path, file);
> out2:
> mnt_drop_write(path.mnt);
> out:
With the merge window about to open, this is a reminder that this
conflict still exists.
Those vfs tree commits have also been merged into the block tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-02-14 21:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 6:00 linux-next: manual merge of the pidfd tree with the vfs tree Stephen Rothwell
2021-02-14 21:05 ` Stephen Rothwell [this message]
2021-02-21 22:51 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-01-25 5:17 Stephen Rothwell
2021-02-14 20:55 ` Stephen Rothwell
2021-02-24 22:38 ` Stephen Rothwell
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=20210215080521.45f7a061@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=christian.brauner@ubuntu$(echo .)com \
--cc=christian@brauner$(echo .)io \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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