linux-kernel - linux-next: manual merge of the ntfs3 tree with the vfs-idmapping 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 for Android: free password hash cracker in your pocket

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

Date:   Thu, 16 Feb 2023 08:30:02 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Konstantin Komarov <almaz.alexandrovich@...agon-software.com>,
        Christian Brauner <christian@...uner.io>,
        Seth Forshee <sforshee@...nel.org>
Cc:     Christian Brauner <brauner@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the ntfs3 tree with the vfs-idmapping
 tree

Hi all,

Today's linux-next merge of the ntfs3 tree got conflicts in:

  fs/ntfs3/file.c

between commit:

  c1632a0f1120 ("fs: port ->setattr() to pass mnt_idmap")

from the vfs-idmapping tree and commit:

  d1468d48fe7a ("fs/ntfs3: Remove noacsrules")

from the ntfs3 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/ntfs3/file.c
index e9bdc1ff08c9,a10a905ec7ce..000000000000
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@@ -657,26 -653,16 +653,16 @@@ out
  /*
   * ntfs3_setattr - inode_operations::setattr
   */
 -int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
 +int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
  		  struct iattr *attr)
  {
- 	struct super_block *sb = dentry->d_sb;
- 	struct ntfs_sb_info *sbi = sb->s_fs_info;
  	struct inode *inode = d_inode(dentry);
  	struct ntfs_inode *ni = ntfs_i(inode);
  	u32 ia_valid = attr->ia_valid;
  	umode_t mode = inode->i_mode;
  	int err;
  
- 	if (sbi->options->noacsrules) {
- 		/* "No access rules" - Force any changes of time etc. */
- 		attr->ia_valid |= ATTR_FORCE;
- 		/* and disable for editing some attributes. */
- 		attr->ia_valid &= ~(ATTR_UID | ATTR_GID | ATTR_MODE);
- 		ia_valid = attr->ia_valid;
- 	}
- 
 -	err = setattr_prepare(mnt_userns, dentry, attr);
 +	err = setattr_prepare(idmap, dentry, attr);
  	if (err)
  		goto out;
  

Content of type "application/pgp-signature" skipped