From: Nicolai Stange <nicstange@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Johannes Berg <johannes@sipsolutions.net>,
"Paul E.McKenney" <paulmck@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org,
Nicolai Stange <nicstange@gmail.com>
Subject: [RFC PATCH v2 7/9] debugfs: call debugfs_real_fops() only after debugfs_file_get()
Date: Wed, 3 May 2017 16:17:24 +0200 [thread overview]
Message-ID: <20170503141726.13992-8-nicstange@gmail.com> (raw)
In-Reply-To: <20170503141726.13992-1-nicstange@gmail.com>
The current implementation of debugfs_real_fops() relies on a
debugfs_fsdata instance to be installed at ->d_fsdata.
With future patches introducing lazy allocation of these, this requirement
will be guaranteed to be fullfilled only inbetween a
debugfs_file_get()/debugfs_file_put() pair.
The full proxies' fops implemented by debugfs happen to be the only
offenders. Fix them up by moving their debugfs_real_fops() calls past those
to debugfs_file_get().
full_proxy_release() is special as it doesn't invoke debugfs_file_get() at
all. Leave it alone for now.
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
---
fs/debugfs/file.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index 7de733ccdf6c..d92038c5f131 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -144,13 +144,13 @@ const struct file_operations debugfs_open_proxy_file_operations = {
static ret_type full_proxy_ ## name(proto) \
{ \
struct dentry *dentry = F_DENTRY(filp); \
- const struct file_operations *real_fops = \
- debugfs_real_fops(filp); \
+ const struct file_operations *real_fops; \
ret_type r; \
\
r = debugfs_file_get(dentry); \
if (unlikely(r)) \
return r; \
+ real_fops = debugfs_real_fops(filp); \
r = real_fops->name(args); \
debugfs_file_put(dentry); \
return r; \
@@ -177,13 +177,14 @@ FULL_PROXY_FUNC(unlocked_ioctl, long, filp,
static unsigned int full_proxy_poll(struct file *filp,
struct poll_table_struct *wait)
{
- const struct file_operations *real_fops = debugfs_real_fops(filp);
struct dentry *dentry = F_DENTRY(filp);
unsigned int r = 0;
+ const struct file_operations *real_fops;
if (debugfs_file_get(dentry))
return POLLHUP;
+ real_fops = debugfs_real_fops(filp);
r = real_fops->poll(filp, wait);
debugfs_file_put(dentry);
return r;
--
2.12.2
next prev parent reply other threads:[~2017-05-03 14:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-03 14:17 [RFC PATCH v2 0/9] debugfs: per-file removal protection Nicolai Stange
2017-05-03 14:17 ` [RFC PATCH v2 1/9] debugfs: add support for more elaborate ->d_fsdata Nicolai Stange
2017-05-03 14:17 ` [RFC PATCH v2 2/9] debugfs: implement per-file removal protection Nicolai Stange
2017-05-03 14:17 ` [RFC PATCH v2 3/9] debugfs: debugfs_real_fops(): drop __must_hold sparse annotation Nicolai Stange
2017-05-03 14:17 ` [RFC PATCH v2 4/9] debugfs: convert to debugfs_file_get() and -put() Nicolai Stange
2017-05-03 14:17 ` [RFC PATCH v2 5/9] IB/hfi1: " Nicolai Stange
2017-05-03 14:17 ` [RFC PATCH v2 6/9] debugfs: purge obsolete SRCU based removal protection Nicolai Stange
2017-05-03 14:17 ` Nicolai Stange [this message]
2017-05-03 14:17 ` [RFC PATCH v2 8/9] debugfs: defer debugfs_fsdata allocation to first usage Nicolai Stange
2017-05-03 14:17 ` [RFC PATCH v2 9/9] debugfs: free debugfs_fsdata instances Nicolai Stange
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=20170503141726.13992-8-nicstange@gmail.com \
--to=nicstange@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
/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