linux-kernel - linux-next: manual merge of the ecryptfs tree with the pidfd 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>] [day] [month] [year] [list]

Message-ID: <20210127102342.0d1852e2@canb.auug.org.au>
Date:   Wed, 27 Jan 2021 10:23:42 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Tyler Hicks <tyhicks@...onical.com>,
        Christian Brauner <christian.brauner@...ntu.com>
Cc:     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>,
        Tyler Hicks <code@...icks.com>
Subject: linux-next: manual merge of the ecryptfs tree with the pidfd tree

Hi all,

Today's linux-next merge of the ecryptfs tree got a conflict in:

  fs/ecryptfs/inode.c

between commit:

  c7c7a1a18af4 ("xattr: handle idmapped mounts")

from the pidfd tree and commit:

  0b964446c63f ("ecryptfs: fix uid translation for setxattr on security.capability")

from the ecryptfs 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/ecryptfs/inode.c
index 55da9a91f51a,58d0f7187997..000000000000
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@@ -1043,10 -1024,11 +1045,11 @@@ ecryptfs_setxattr(struct dentry *dentry
  		rc = -EOPNOTSUPP;
  		goto out;
  	}
- 	rc = vfs_setxattr(&init_user_ns, lower_dentry, name, value, size,
- 			  flags);
+ 	inode_lock(lower_inode);
 -	rc = __vfs_setxattr_locked(lower_dentry, name, value, size, flags, NULL);
++	rc = __vfs_setxattr_locked(&init_user_ns, lower_dentry, name, value, size, flags, NULL);
+ 	inode_unlock(lower_inode);
  	if (!rc && inode)
- 		fsstack_copy_attr_all(inode, d_inode(lower_dentry));
+ 		fsstack_copy_attr_all(inode, lower_inode);
  out:
  	return rc;
  }

Content of type "application/pgp-signature" skipped