linux-kernel - linux-next: manual merge of the iversion 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20230119101423.547b48b7@canb.auug.org.au>
Date:   Thu, 19 Jan 2023 10:14:23 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jeff Layton <jlayton@...nel.org>,
        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 iversion tree with the
 vfs-idmapping tree

Hi all,

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

  fs/stat.c

between commit:

  9a516a5ea11a ("fs: port ->getattr() to pass mnt_idmap")

from the vfs-idmapping tree and commit:

  d84b698e9362 ("vfs: plumb i_version handling into struct kstat")

from the iversion 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/stat.c
index f540047e1177,06fd3fc1ab84..000000000000
--- a/fs/stat.c
+++ b/fs/stat.c
@@@ -122,12 -120,17 +123,17 @@@ int vfs_getattr_nosec(const struct pat
  	stat->attributes_mask |= (STATX_ATTR_AUTOMOUNT |
  				  STATX_ATTR_DAX);
  
+ 	if ((request_mask & STATX_CHANGE_COOKIE) && IS_I_VERSION(inode)) {
+ 		stat->result_mask |= STATX_CHANGE_COOKIE;
+ 		stat->change_cookie = inode_query_iversion(inode);
+ 	}
+ 
 -	mnt_userns = mnt_user_ns(path->mnt);
 +	idmap = mnt_idmap(path->mnt);
  	if (inode->i_op->getattr)
 -		return inode->i_op->getattr(mnt_userns, path, stat,
 +		return inode->i_op->getattr(idmap, path, stat,
  					    request_mask, query_flags);
  
 -	generic_fillattr(mnt_userns, inode, stat);
 +	generic_fillattr(idmap, inode, stat);
  	return 0;
  }
  EXPORT_SYMBOL(vfs_getattr_nosec);

Content of type "application/pgp-signature" skipped