Commit 165ea0d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs fixes from Al Viro:
 "Fix several places that screw up cleanups after failures halfway
  through opening a file (one open-coding filp_clone_open() and getting
  it wrong, two misusing alloc_file()). That part is -stable fodder from
  the 'work.open' branch.

  And Christoph's regression fix for uapi breakage in aio series;
  include/uapi/linux/aio_abi.h shouldn't be pulling in the kernel
  definition of sigset_t, the reason for doing so in the first place had
  been bogus - there's no need to expose struct __aio_sigset in
  aio_abi.h at all"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  aio: don't expose __aio_sigset in uapi
  ocxlflash_getfile(): fix double-iput() on alloc_file() failures
  cxl_getfile(): fix double-iput() on alloc_file() failures
  drm_mode_create_lease_ioctl(): fix open-coded filp_clone_open()
parents f88a333b 9ba546c0

drivers/gpu/drm/drm_lease.c

+1 −15
Original line number Diff line number Diff line
@@ -553,24 +553,13 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, 


	/* Clone the lessor file to create a new file for us */

	DRM_DEBUG_LEASE("Allocating lease file\n");

	path_get(&lessor_file->f_path);

	lessee_file = alloc_file(&lessor_file->f_path,

				 lessor_file->f_mode,

				 fops_get(lessor_file->f_inode->i_fop));



	lessee_file = filp_clone_open(lessor_file);

	if (IS_ERR(lessee_file)) {

		ret = PTR_ERR(lessee_file);

		goto out_lessee;

	}



	/* Initialize the new file for DRM */

	DRM_DEBUG_LEASE("Initializing the file with %p\n", lessee_file->f_op->open);

	ret = lessee_file->f_op->open(lessee_file->f_inode, lessee_file);

	if (ret)

		goto out_lessee_file;



	lessee_priv = lessee_file->private_data;



	/* Change the file to a master one */

	drm_master_put(&lessee_priv->master);

	lessee_priv->master = lessee;
@@ -588,9 +577,6 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, 
	DRM_DEBUG_LEASE("drm_mode_create_lease_ioctl succeeded\n");

	return 0;



out_lessee_file:

	fput(lessee_file);



out_lessee:

	drm_master_put(&lessee);

drivers/misc/cxl/api.c

+4 −4
Original line number Diff line number Diff line
@@ -103,15 +103,15 @@ static struct file *cxl_getfile(const char *name, 
	d_instantiate(path.dentry, inode);



	file = alloc_file(&path, OPEN_FMODE(flags), fops);

	if (IS_ERR(file))

		goto err_dput;

	if (IS_ERR(file)) {

		path_put(&path);

		goto err_fs;

	}

	file->f_flags = flags & (O_ACCMODE | O_NONBLOCK);

	file->private_data = priv;



	return file;



err_dput:

	path_put(&path);

err_inode:

	iput(inode);

err_fs:

drivers/scsi/cxlflash/ocxl_hw.c

+2 −3
Original line number Diff line number Diff line
@@ -134,15 +134,14 @@ static struct file *ocxlflash_getfile(struct device *dev, const char *name, 
		rc = PTR_ERR(file);

		dev_err(dev, "%s: alloc_file failed rc=%d\n",

			__func__, rc);

		goto err5;

		path_put(&path);

		goto err3;

	}



	file->f_flags = flags & (O_ACCMODE | O_NONBLOCK);

	file->private_data = priv;

out:

	return file;

err5:

	path_put(&path);

err4:

	iput(inode);

err3:

fs/aio.c

+5 −0
Original line number Diff line number Diff line
@@ -1896,6 +1896,11 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, 
	return ret;

}



struct __aio_sigset {

	const sigset_t __user	*sigmask;

	size_t		sigsetsize;

};



SYSCALL_DEFINE6(io_pgetevents,

		aio_context_t, ctx_id,

		long, min_nr,

fs/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ int do_fchownat(int dfd, const char __user *filename, uid_t user, gid_t group, 


extern int open_check_o_direct(struct file *f);

extern int vfs_open(const struct path *, struct file *, const struct cred *);

extern struct file *filp_clone_open(struct file *);



/*

 * inode.c

CRA Git | Maintained and supported by SUSTech CRA and CCSE