From: Hou Tao <houtao1@huawei.com>
To: <linux-fsdevel@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <viro@zeniv.linux.org.uk>,
<jbaron@akamai.com>, <oleg@redhat.com>, <dave@stgolabs.net>,
<koct9i@gmail.com>
Subject: [RFC][PATCH 7/8] epoll: prevent the double-free of epi in eventpoll_release_file()
Date: Sat, 28 Oct 2017 20:58:26 +0800 [thread overview]
Message-ID: <1509195507-29037-8-git-send-email-houtao1@huawei.com> (raw)
In-Reply-To: <1509195507-29037-1-git-send-email-houtao1@huawei.com>
After the removal of epmutex, it's possible eventpoll_release_file()
and ep_free() will try to remove the same epi. The removal of epi
is protected by ep->mtx, so there are two possible sequences:
(1) eventpoll_release_file() first, then ep_free()
there is no double-free, because after the invocation of
eventpoll_release_file(), the epi will be removed from ep->rbr
and ep_free() will not be able to free it.
(2) ep_free() first, then eventpoll_release_file()
double-free is possible because before the invocation of ep_remove()
in ep_free() eventpoll_release_file may has already got the epi from
file->f_ep_links. To protect against the double-free case, check
rb_first_cached() in eventpoll_release_file() to ensure the epi
has not been removed by ep_free()
Signed-off-by: Hou Tao <houtao1@huawei.com>
---
fs/eventpoll.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 27b743b..cd7a9f4 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1058,13 +1058,22 @@ void eventpoll_release_file(struct file *file)
break;
ep = eventpoll_get_ep(epi->ep);
- /* Current epi has been removed by ep_free() */
+ /* Current epi had been removed by ep_free() */
if (!ep)
continue;
rcu_read_unlock();
mutex_lock_nested(&ep->mtx, 0);
- ep_remove(ep, epi);
+ /*
+ * If rb_first_cached() returns NULL, it means that the current epi
+ * had been removed by ep_free(). To prevent epi from double-freeing,
+ * check the condition before invoking ep_remove().
+ * If eventpoll_release_file() frees epi firstly, the epi will not
+ * be freed again because the epi must have been removed from ep->rbr
+ * when ep_free() is invoked.
+ */
+ if (rb_first_cached(&ep->rbr))
+ ep_remove(ep, epi);
mutex_unlock(&ep->mtx);
eventpoll_put_ep(ep);
--
2.7.5
next prev parent reply other threads:[~2017-10-28 12:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-28 12:58 [RFC][PATCH 0/8] epoll: remove epmutex from ep_free() and eventpoll_release_file() for non-nested case Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 1/8] epoll: remove epmutex from ep_free() & eventpoll_release_file() Hou Tao
2017-10-28 13:58 ` Davidlohr Bueso
2017-10-30 7:09 ` Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 2/8] epoll: remove ep from visited_list when freeing ep Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 3/8] epoll: remove file from tfile_check_list when releasing file Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 4/8] epoll: free eventpoll by rcu to provide existence guarantee Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 5/8] epoll: iterate epi in file->f_ep_links by using list_first_or_null_rcu Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 6/8] epoll: ensure the validity of ep when removing epi in eventpoll_release_file() Hou Tao
2017-10-28 12:58 ` Hou Tao [this message]
2017-10-28 12:58 ` [RFC][PATCH 8/8] epoll: protect the iteration of ep->rbr by ep->mtx in ep_free() Hou Tao
2017-10-31 13:01 ` [RFC][PATCH 0/8] epoll: remove epmutex from ep_free() and eventpoll_release_file() for non-nested case Davidlohr Bueso
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=1509195507-29037-8-git-send-email-houtao1@huawei.com \
--to=houtao1@huawei.com \
--cc=dave@stgolabs.net \
--cc=jbaron@akamai.com \
--cc=koct9i@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=viro@zeniv.linux.org.uk \
/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).