Commit 6df7cc22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ovl-update-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs 

Pull overlayfs update from Miklos Szeredi:

 - Fix a couple of bugs found by syzbot

 - Don't ingore some open flags set by fcntl(F_SETFL)

 - Fix failure to create a hard link in certain cases

 - Use type safe helpers for some mnt_userns transformations

 - Improve performance of mount

 - Misc cleanups

* tag 'ovl-update-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: Kconfig: Fix spelling mistake "undelying" -> "underlying"
  ovl: use inode instead of dentry where possible
  ovl: Add comment on upperredirect reassignment
  ovl: use plain list filler in indexdir and workdir cleanup
  ovl: do not reconnect upper index records in ovl_indexdir_cleanup()
  ovl: fix comment typos
  ovl: port to vfs{g,u}id_t and associated helpers
  ovl: Use ovl mounter's fsuid and fsgid in ovl_link()
  ovl: Use "buf" flexible array for memcpy() destination
  ovl: update ->f_iocb_flags when ovl_change_flags() modifies ->f_flags
  ovl: fix use inode directly in rcu-walk mode
parents 4a6bff11 637d13b5

fs/overlayfs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ config OVERLAY_FS_XINO_AUTO 
	depends on 64BIT

	help

	  If this config option is enabled then overlay filesystems will use

	  unused high bits in undelying filesystem inode numbers to map all

	  unused high bits in underlying filesystem inode numbers to map all

	  inodes to a unified address space.  The mapped 64bit inode numbers

	  might not be compatible with applications that expect 32bit inodes.

fs/overlayfs/dir.c

+30 −16
Original line number Diff line number Diff line
@@ -576,12 +576,26 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode, 
			goto out_revert_creds;

	}



	if (!attr->hardlink) {

		err = -ENOMEM;

		override_cred = prepare_creds();

	if (override_cred) {

		if (!override_cred)

			goto out_revert_creds;

		/*

		 * In the creation cases(create, mkdir, mknod, symlink),

		 * ovl should transfer current's fs{u,g}id to underlying

		 * fs. Because underlying fs want to initialize its new

		 * inode owner using current's fs{u,g}id. And in this

		 * case, the @inode is a new inode that is initialized

		 * in inode_init_owner() to current's fs{u,g}id. So use

		 * the inode's i_{u,g}id to override the cred's fs{u,g}id.

		 *

		 * But in the other hardlink case, ovl_link() does not

		 * create a new inode, so just use the ovl mounter's

		 * fs{u,g}id.

		 */

		override_cred->fsuid = inode->i_uid;

		override_cred->fsgid = inode->i_gid;

		if (!attr->hardlink) {

		err = security_dentry_create_files_as(dentry,

				attr->mode, &dentry->d_name, old_cred,

				override_cred);
@@ -589,15 +603,15 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode, 
			put_cred(override_cred);

			goto out_revert_creds;

		}

		}

		put_cred(override_creds(override_cred));

		put_cred(override_cred);

	}



	if (!ovl_dentry_is_whiteout(dentry))

		err = ovl_create_upper(dentry, inode, attr);

	else

		err = ovl_create_over_whiteout(dentry, inode, attr);

	}



out_revert_creds:

	revert_creds(old_cred);

	return err;

fs/overlayfs/export.c

+4 −4
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static struct dentry *ovl_obtain_alias(struct super_block *sb, 
	return dentry;

}



/* Get the upper or lower dentry in stach whose on layer @idx */

/* Get the upper or lower dentry in stack whose on layer @idx */

static struct dentry *ovl_dentry_real_at(struct dentry *dentry, int idx)

{

	struct ovl_entry *oe = dentry->d_fsdata;
@@ -463,7 +463,7 @@ static struct dentry *ovl_lookup_real_inode(struct super_block *sb, 


	/* Get connected upper overlay dir from index */

	if (index) {

		struct dentry *upper = ovl_index_upper(ofs, index);

		struct dentry *upper = ovl_index_upper(ofs, index, true);



		dput(index);

		if (IS_ERR_OR_NULL(upper))
@@ -739,7 +739,7 @@ static struct dentry *ovl_lower_fh_to_d(struct super_block *sb, 


	/* Then try to get a connected upper dir by index */

	if (index && d_is_dir(index)) {

		struct dentry *upper = ovl_index_upper(ofs, index);

		struct dentry *upper = ovl_index_upper(ofs, index, true);



		err = PTR_ERR(upper);

		if (IS_ERR_OR_NULL(upper))
@@ -796,7 +796,7 @@ static struct ovl_fh *ovl_fid_to_fh(struct fid *fid, int buflen, int fh_type) 
		return ERR_PTR(-ENOMEM);



	/* Copy unaligned inner fh into aligned buffer */

	memcpy(&fh->fb, fid, buflen - OVL_FH_WIRE_OFFSET);

	memcpy(fh->buf, fid, buflen - OVL_FH_WIRE_OFFSET);

	return fh;

}

fs/overlayfs/file.c

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static char ovl_whatisit(struct inode *inode, struct inode *realinode) 
		return 'm';

}



/* No atime modificaton nor notify on underlying */

/* No atime modification nor notify on underlying */

#define OVL_OPEN_FLAGS (O_NOATIME | FMODE_NONOTIFY)



static struct file *ovl_open_realfile(const struct file *file,
@@ -96,6 +96,7 @@ static int ovl_change_flags(struct file *file, unsigned int flags) 


	spin_lock(&file->f_lock);

	file->f_flags = (file->f_flags & ~OVL_SETFL_MASK) | flags;

	file->f_iocb_flags = iocb_flags(file);

	spin_unlock(&file->f_lock);



	return 0;

fs/overlayfs/namei.c

+9 −3
Original line number Diff line number Diff line
@@ -487,7 +487,8 @@ int ovl_verify_set_fh(struct ovl_fs *ofs, struct dentry *dentry, 
}



/* Get upper dentry from index */

struct dentry *ovl_index_upper(struct ovl_fs *ofs, struct dentry *index)

struct dentry *ovl_index_upper(struct ovl_fs *ofs, struct dentry *index,

			       bool connected)

{

	struct ovl_fh *fh;

	struct dentry *upper;
@@ -499,7 +500,7 @@ struct dentry *ovl_index_upper(struct ovl_fs *ofs, struct dentry *index) 
	if (IS_ERR_OR_NULL(fh))

		return ERR_CAST(fh);



	upper = ovl_decode_real_fh(ofs, fh, ovl_upper_mnt(ofs), true);

	upper = ovl_decode_real_fh(ofs, fh, ovl_upper_mnt(ofs), connected);

	kfree(fh);



	if (IS_ERR_OR_NULL(upper))
@@ -572,7 +573,7 @@ int ovl_verify_index(struct ovl_fs *ofs, struct dentry *index) 
	 * directly from the index dentry, but for dir index we first need to

	 * decode the upper directory.

	 */

	upper = ovl_index_upper(ofs, index);

	upper = ovl_index_upper(ofs, index, false);

	if (IS_ERR_OR_NULL(upper)) {

		err = PTR_ERR(upper);

		/*
@@ -1085,6 +1086,11 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, 
			.mnt = ovl_upper_mnt(ofs),

		};



		/*

		 * It's safe to assign upperredirect here: the previous

		 * assignment of happens only if upperdentry is non-NULL, and

		 * this one only if upperdentry is NULL.

		 */

		upperredirect = ovl_get_redirect_xattr(ofs, &upperpath, 0);

		if (IS_ERR(upperredirect)) {

			err = PTR_ERR(upperredirect);