Commit 44fea373 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ovl-fixes-5.8-rc6' of... 

Merge tag 'ovl-fixes-5.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into master

Pull overlayfs fixes from Miklos Szeredi:

 - fix a regression introduced in v4.20 in handling a regenerated
   squashfs lower layer

 - two regression fixes for this cycle, one of which is Oops inducing

 - miscellaneous issues

* tag 'ovl-fixes-5.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: fix lookup of indexed hardlinks with metacopy
  ovl: fix unneeded call to ovl_change_flags()
  ovl: fix mount option checks for nfs_export with no upperdir
  ovl: force read-only sb on failure to create index dir
  ovl: fix regression with re-formatted lower squashfs
  ovl: fix oops in ovl_indexdir_cleanup() with nfs_export=on
  ovl: relax WARN_ON() when decoding lower directory file handle
  ovl: remove not used argument in ovl_check_origin
  ovl: change ovl_copy_up_flags static
  ovl: inode reference leak in ovl_is_inuse true case.
parents 33b9108f 4518dfcf

Documentation/filesystems/overlayfs.rst

+2 −2
Original line number Diff line number Diff line
@@ -560,8 +560,8 @@ When the NFS export feature is enabled, all directory index entries are 
verified on mount time to check that upper file handles are not stale.

This verification may cause significant overhead in some cases.



Note: the mount options index=off,nfs_export=on are conflicting and will

result in an error.

Note: the mount options index=off,nfs_export=on are conflicting for a

read-write mount and will result in an error.





Testsuite

fs/overlayfs/copy_up.c

+1 −1
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry, 
	return err;

}



int ovl_copy_up_flags(struct dentry *dentry, int flags)

static int ovl_copy_up_flags(struct dentry *dentry, int flags)

{

	int err = 0;

	const struct cred *old_cred = ovl_override_creds(dentry->d_sb);

fs/overlayfs/export.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static struct dentry *ovl_lookup_real_inode(struct super_block *sb, 
	if (IS_ERR_OR_NULL(this))

		return this;



	if (WARN_ON(ovl_dentry_real_at(this, layer->idx) != real)) {

	if (ovl_dentry_real_at(this, layer->idx) != real) {

		dput(this);

		this = ERR_PTR(-EIO);

	}

fs/overlayfs/file.c

+6 −4
Original line number Diff line number Diff line
@@ -33,13 +33,16 @@ static char ovl_whatisit(struct inode *inode, struct inode *realinode) 
		return 'm';

}



/* No atime modificaton nor notify on underlying */

#define OVL_OPEN_FLAGS (O_NOATIME | FMODE_NONOTIFY)



static struct file *ovl_open_realfile(const struct file *file,

				      struct inode *realinode)

{

	struct inode *inode = file_inode(file);

	struct file *realfile;

	const struct cred *old_cred;

	int flags = file->f_flags | O_NOATIME | FMODE_NONOTIFY;

	int flags = file->f_flags | OVL_OPEN_FLAGS;

	int acc_mode = ACC_MODE(flags);

	int err;
@@ -72,8 +75,7 @@ static int ovl_change_flags(struct file *file, unsigned int flags) 
	struct inode *inode = file_inode(file);

	int err;



	/* No atime modificaton on underlying */

	flags |= O_NOATIME | FMODE_NONOTIFY;

	flags |= OVL_OPEN_FLAGS;



	/* If some flag changed that cannot be changed then something's amiss */

	if (WARN_ON((file->f_flags ^ flags) & ~OVL_SETFL_MASK))
@@ -126,7 +128,7 @@ static int ovl_real_fdget_meta(const struct file *file, struct fd *real, 
	}



	/* Did the flags change since open? */

	if (unlikely((file->f_flags ^ real->file->f_flags) & ~O_NOATIME))

	if (unlikely((file->f_flags ^ real->file->f_flags) & ~OVL_OPEN_FLAGS))

		return ovl_change_flags(real->file, file->f_flags);



	return 0;

fs/overlayfs/namei.c

+6 −9
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ invalid: 
}



static int ovl_check_origin(struct ovl_fs *ofs, struct dentry *upperdentry,

			    struct ovl_path **stackp, unsigned int *ctrp)

			    struct ovl_path **stackp)

{

	struct ovl_fh *fh = ovl_get_fh(upperdentry, OVL_XATTR_ORIGIN);

	int err;
@@ -406,10 +406,6 @@ static int ovl_check_origin(struct ovl_fs *ofs, struct dentry *upperdentry, 
		return err;

	}



	if (WARN_ON(*ctrp))

		return -EIO;



	*ctrp = 1;

	return 0;

}
@@ -861,8 +857,6 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, 
			goto out;

		}

		if (upperdentry && !d.is_dir) {

			unsigned int origin_ctr = 0;



			/*

			 * Lookup copy up origin by decoding origin file handle.

			 * We may get a disconnected dentry, which is fine,
@@ -873,8 +867,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, 
			 * number - it's the same as if we held a reference

			 * to a dentry in lower layer that was moved under us.

			 */

			err = ovl_check_origin(ofs, upperdentry, &origin_path,

					       &origin_ctr);

			err = ovl_check_origin(ofs, upperdentry, &origin_path);

			if (err)

				goto out_put_upper;
@@ -1073,6 +1066,10 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, 
			upperredirect = NULL;

			goto out_free_oe;

		}

		err = ovl_check_metacopy_xattr(upperdentry);

		if (err < 0)

			goto out_free_oe;

		uppermetacopy = err;

	}



	if (upperdentry || ctr) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE