From: Dominique Martinet <asmadeus@codewreck.org>
To: unlisted-recipients:; (no To-header on input)
Cc: Dominique Martinet <dominique.martinet@cea.fr>,
v9fs-developer@lists.sourceforge.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Eric Van Hensbergen <ericvh@gmail.com>,
Latchesar Ionkov <lucho@ionkov.net>,
Tomas Bortoli <tomasbortoli@gmail.com>
Subject: [PATCH 2/2] 9p/trans_fd: put worker reqs on destroy
Date: Tue, 9 Oct 2018 06:05:56 +0200 [thread overview]
Message-ID: <1539057956-23741-2-git-send-email-asmadeus@codewreck.org> (raw)
In-Reply-To: <1539057956-23741-1-git-send-email-asmadeus@codewreck.org>
From: Dominique Martinet <dominique.martinet@cea.fr>
p9_read_work/p9_write_work might still hold references to a req after
having been cancelled; make sure we put any of these to avoid potential
request leak on disconnect.
Fixes: 728356dedeff8 ("9p: Add refcount to p9_req_t")
Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Cc: Tomas Bortoli <tomasbortoli@gmail.com>
---
Noticed we could leak a ref while looking at the syzbot report,
this should be safe enough after the work has been cancelled...
Probably.
net/9p/trans_fd.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index a0317d459cde..f868cf6fba79 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -876,7 +876,15 @@ static void p9_conn_destroy(struct p9_conn *m)
p9_mux_poll_stop(m);
cancel_work_sync(&m->rq);
+ if (m->rreq) {
+ p9_req_put(m->rreq);
+ m->rreq = NULL;
+ }
cancel_work_sync(&m->wq);
+ if (m->wreq) {
+ p9_req_put(m->wreq);
+ m->wreq = NULL;
+ }
p9_conn_cancel(m, -ECONNRESET);
--
2.19.1
next prev parent reply other threads:[~2018-10-09 4:06 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 5:59 BUG: corrupted list in p9_read_work syzbot
2018-10-09 1:07 ` syzbot
2018-10-09 2:09 ` Dominique Martinet
2018-10-09 4:05 ` [PATCH 1/2] 9p/trans_fd: abort p9_read_work if req status changed Dominique Martinet
2018-10-09 4:05 ` Dominique Martinet [this message]
2018-10-09 13:19 ` [PATCH 2/2] 9p/trans_fd: put worker reqs on destroy Tomas Bortoli
2018-10-15 10:46 ` Dominique Martinet
2018-10-10 14:03 ` BUG: corrupted list in p9_read_work Dmitry Vyukov
2018-10-10 14:40 ` Dominique Martinet
2018-10-10 14:51 ` Dmitry Vyukov
2018-10-10 15:58 ` Dominique Martinet
2018-10-11 12:33 ` Dmitry Vyukov
2018-10-11 13:10 ` Dominique Martinet
2018-10-11 13:27 ` Dmitry Vyukov
2018-10-11 13:40 ` Dmitry Vyukov
2018-10-11 14:28 ` 9p/RDMA for syzkaller (Was: BUG: corrupted list in p9_read_work) Dominique Martinet
2018-10-12 14:42 ` Dmitry Vyukov
2018-10-11 14:19 ` Dominique Martinet
2018-10-12 14:50 ` Dmitry Vyukov
2018-10-12 15:08 ` Dominique Martinet
2018-11-17 8:46 ` Dominique Martinet
2018-11-20 11:20 ` Dmitry Vyukov
2018-11-20 11:28 ` Dominique Martinet
2018-10-10 14:29 ` BUG: corrupted list in p9_read_work Dmitry Vyukov
2018-10-10 14:48 ` Dominique Martinet
2018-10-10 14:49 ` syzbot
2018-10-10 16:00 ` Dominique Martinet
2018-10-10 16:02 ` syzbot
2018-10-10 16:10 ` Dominique Martinet
2018-10-10 16:29 ` syzbot
2018-10-10 16:36 ` Dmitry Vyukov
2018-10-10 22:55 ` Dominique Martinet
2018-10-10 14:42 ` Dmitry Vyukov
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=1539057956-23741-2-git-send-email-asmadeus@codewreck.org \
--to=asmadeus@codewreck.org \
--cc=dominique.martinet@cea.fr \
--cc=ericvh@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lucho@ionkov.net \
--cc=netdev@vger.kernel.org \
--cc=tomasbortoli@gmail.com \
--cc=v9fs-developer@lists.sourceforge.net \
/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