From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <christian@brauner•io>
Cc: Miklos Szeredi <miklos@szeredi•hu>,
Amir Goldstein <amir73il@gmail•com>,
Christian Brauner <christian.brauner@ubuntu•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miklos Szeredi <mszeredi@redhat•com>,
Tycho Andersen <tycho@tycho•pizza>
Subject: Re: linux-next: manual merge of the pidfd tree with the overlayfs tree
Date: Fri, 5 Feb 2021 09:42:05 +1100 [thread overview]
Message-ID: <20210205094205.6a7490b4@canb.auug.org.au> (raw)
In-Reply-To: <20210125170426.3b941eac@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2220 bytes --]
Hi all,
On Mon, 25 Jan 2021 17:04:26 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> fs/overlayfs/copy_up.c
>
> between commit:
>
> 06896fa3193d ("ovl: skip getxattr of security labels")
>
> from the overlayfs tree and commit:
>
> c7c7a1a18af4 ("xattr: handle idmapped mounts")
>
> 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/overlayfs/copy_up.c
> index 0fed532efa68,f81b836c2256..000000000000
> --- a/fs/overlayfs/copy_up.c
> +++ b/fs/overlayfs/copy_up.c
> @@@ -84,18 -84,10 +84,18 @@@ int ovl_copy_xattr(struct super_block *
>
> if (ovl_is_private_xattr(sb, name))
> continue;
> +
> + error = security_inode_copy_up_xattr(name);
> + if (error < 0 && error != -EOPNOTSUPP)
> + break;
> + if (error == 1) {
> + error = 0;
> + continue; /* Discard */
> + }
> retry:
> - size = vfs_getxattr(old, name, value, value_size);
> + size = vfs_getxattr(&init_user_ns, old, name, value, value_size);
> if (size == -ERANGE)
> - size = vfs_getxattr(old, name, NULL, 0);
> + size = vfs_getxattr(&init_user_ns, old, name, NULL, 0);
>
> if (size < 0) {
> error = size;
> @@@ -115,7 -107,14 +115,7 @@@
> goto retry;
> }
>
> - error = vfs_setxattr(new, name, value, size, 0);
> - error = security_inode_copy_up_xattr(name);
> - if (error < 0 && error != -EOPNOTSUPP)
> - break;
> - if (error == 1) {
> - error = 0;
> - continue; /* Discard */
> - }
> + error = vfs_setxattr(&init_user_ns, new, name, value, size, 0);
> if (error) {
> if (error != -EOPNOTSUPP || ovl_must_copy_xattr(name))
> break;
This is now a conflict between the pidfd tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-02-04 22:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 6:04 linux-next: manual merge of the pidfd tree with the overlayfs tree Stephen Rothwell
2021-02-04 22:42 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-25 6:07 Stephen Rothwell
2021-02-04 22:40 ` Stephen Rothwell
2021-01-25 5:23 Stephen Rothwell
2021-01-31 23:19 ` 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=20210205094205.6a7490b4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=amir73il@gmail$(echo .)com \
--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=miklos@szeredi$(echo .)hu \
--cc=mszeredi@redhat$(echo .)com \
--cc=tycho@tycho$(echo .)pizza \
/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