Commit 0acffb23 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull overlayfs fixes from Miklos Szeredi:
 "Fix two bugs, a recent one introduced in the last cycle, and an older
  one from v5.11"

* tag 'ovl-fixes-6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: fail on invalid uid/gid mapping at copy up
  ovl: fix tmpfile leak
parents 76e26e3c 4f11ada1

fs/overlayfs/copy_up.c

+5 −1
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ static int ovl_copy_up_tmpfile(struct ovl_copy_up_ctx *c) 
	if (!c->metacopy && c->stat.size) {

		err = ovl_copy_up_file(ofs, c->dentry, tmpfile, c->stat.size);

		if (err)

			return err;

			goto out_fput;

	}



	err = ovl_copy_up_metadata(c, temp);
@@ -1011,6 +1011,10 @@ static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry, 
	if (err)

		return err;



	if (!kuid_has_mapping(current_user_ns(), ctx.stat.uid) ||

	    !kgid_has_mapping(current_user_ns(), ctx.stat.gid))

		return -EOVERFLOW;



	ctx.metacopy = ovl_need_meta_copy_up(dentry, ctx.stat.mode, flags);



	if (parent) {