linux-kernel - Re: linux-next: manual merge of the pidfd tree with the overlayfs tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20210205094026.1fa71254@canb.auug.org.au>
Date:   Fri, 5 Feb 2021 09:40:26 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christian Brauner <christian@...uner.io>
Cc:     Miklos Szeredi <miklos@...redi.hu>,
        Christian Brauner <christian.brauner@...ntu.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Miklos Szeredi <mszeredi@...hat.com>,
        Tycho Andersen <tycho@...ho.pizza>
Subject: Re: linux-next: manual merge of the pidfd tree with the overlayfs
 tree

Hi all,

On Mon, 25 Jan 2021 17:07:16 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
> 
>   fs/overlayfs/inode.c
> 
> between commit:
> 
>   9c09be9e71c4 ("ovl: perform vfs_getxattr() with mounter creds")
> 
> 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/inode.c
> index cf41bcb664bc,e78d45dfeaee..000000000000
> --- a/fs/overlayfs/inode.c
> +++ b/fs/overlayfs/inode.c
> @@@ -352,9 -354,7 +354,9 @@@ int ovl_xattr_set(struct dentry *dentry
>   		goto out;
>   
>   	if (!value && !upperdentry) {
>  +		old_cred = ovl_override_creds(dentry->d_sb);
> - 		err = vfs_getxattr(realdentry, name, NULL, 0);
> + 		err = vfs_getxattr(&init_user_ns, realdentry, name, NULL, 0);
>  +		revert_creds(old_cred);
>   		if (err < 0)
>   			goto out_drop_write;
>   	}

This is now a conflict between the pidfd tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped