From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC][PATCH 01/27] drm_mode_create_lease_ioctl(): fix open-coded filp_clone_open()
Date: Mon, 9 Jul 2018 05:53:51 +0100 [thread overview]
Message-ID: <20180709045417.13988-1-viro@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20180709045320.GF30522@ZenIV.linux.org.uk>
From: Al Viro <viro@zeniv.linux.org.uk>
Failure of ->open() should *not* be followed by fput(). Fixed by
using filp_clone_open(), which gets the cleanups right.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
drivers/gpu/drm/drm_lease.c | 16 +---------------
fs/internal.h | 1 -
include/linux/fs.h | 1 +
3 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c
index 50c73c0a20b9..d638c0fb3418 100644
--- a/drivers/gpu/drm/drm_lease.c
+++ b/drivers/gpu/drm/drm_lease.c
@@ -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);
diff --git a/fs/internal.h b/fs/internal.h
index 980d005b21b4..5645b4ebf494 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -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
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 5c91108846db..aa9b4c169ed2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2422,6 +2422,7 @@ extern struct file *filp_open(const char *, int, umode_t);
extern struct file *file_open_root(struct dentry *, struct vfsmount *,
const char *, int, umode_t);
extern struct file * dentry_open(const struct path *, int, const struct cred *);
+extern struct file *filp_clone_open(struct file *);
extern int filp_close(struct file *, fl_owner_t id);
extern struct filename *getname_flags(const char __user *, int, int *);
--
2.11.0
next prev parent reply other threads:[~2018-07-09 4:54 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-09 4:53 [RFC][PATCHES] open()-related cleanups Al Viro
2018-07-09 4:53 ` Al Viro [this message]
2018-07-09 4:53 ` [RFC][PATCH 02/27] cxl_getfile(): fix double-iput() on alloc_file() failures Al Viro
2018-07-09 4:53 ` [RFC][PATCH 03/27] ocxlflash_getfile(): " Al Viro
2018-07-09 4:53 ` [RFC][PATCH 04/27] make sure do_dentry_open() won't return positive as an error Al Viro
2018-07-09 4:53 ` [RFC][PATCH 05/27] introduce FMODE_OPENED Al Viro
2018-07-09 4:53 ` [RFC][PATCH 06/27] get rid of 'opened' argument of finish_open() Al Viro
2018-07-09 4:53 ` [RFC][PATCH 07/27] lift fput() on late failures into path_openat() Al Viro
2018-07-09 4:53 ` [RFC][PATCH 08/27] switch all remaining checks for FILE_OPENED to FMODE_OPENED Al Viro
2018-07-09 4:53 ` [RFC][PATCH 09/27] now we can fold open_check_o_direct() into do_dentry_open() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 10/27] introduce FMODE_CREATED and switch to it Al Viro
2018-07-09 4:54 ` [RFC][PATCH 11/27] IMA: don't propagate opened through the entire thing Al Viro
2018-07-09 4:54 ` [RFC][PATCH 12/27] Preparation to killing ->atomic_open() 'opened' argument Al Viro
2018-07-09 4:54 ` [RFC][PATCH 13/27] get rid of 'opened' argument of ->atomic_open() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 14/27] get rid of 'opened' in path_openat() and the helpers downstream Al Viro
2018-07-09 4:54 ` [RFC][PATCH 15/27] kill FILE_{CREATED,OPENED} Al Viro
2018-07-09 4:54 ` [RFC][PATCH 16/27] new wrapper: alloc_file_pseudo() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 17/27] __shmem_file_setup(): reorder allocations Al Viro
2018-07-09 4:54 ` [RFC][PATCH 18/27] ... and switch shmem_file_setup() to alloc_file_pseudo() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 19/27] cxl_getfile(): switch " Al Viro
2018-07-09 4:54 ` [RFC][PATCH 20/27] ocxlflash_getfile(): " Al Viro
2018-07-09 4:54 ` [RFC][PATCH 21/27] hugetlb_file_setup(): " Al Viro
2018-07-09 4:54 ` [RFC][PATCH 22/27] anon_inode_getfile(): " Al Viro
2018-07-09 4:54 ` [RFC][PATCH 23/27] create_pipe_files(): switch the first allocation " Al Viro
2018-07-09 4:54 ` [RFC][PATCH 24/27] new helper: alloc_file_clone() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 25/27] do_shmat(): grab shp->shm_file earlier, switch to alloc_file_clone() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 26/27] make alloc_file() static Al Viro
2018-07-09 4:54 ` [RFC][PATCH 27/27] turn filp_clone_open() into inline wrapper for dentry_open() Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180709045417.13988-1-viro@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).