diff options
author | Dominique Martinet <dominique.martinet@cea.fr> | 2018-10-08 22:38:00 -0400 |
---|---|---|
committer | Dominique Martinet <dominique.martinet@cea.fr> | 2018-10-09 20:14:34 -0400 |
commit | fb488fc1f2b4c5128540b032892ddec91edaf8d9 (patch) | |
tree | f93afcb06935d0842106be7e80e434a681621812 /net/9p | |
parent | e4ca13f7d075e551dc158df6af18fb412a1dba0a (diff) |
9p/trans_fd: put worker reqs on destroy
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")
Link: http://lkml.kernel.org/r/1539057956-23741-2-git-send-email-asmadeus@codewreck.org
Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Reviewed-by: Tomas Bortoli <tomasbortoli@gmail.com>
Diffstat (limited to 'net/9p')
-rw-r--r-- | net/9p/trans_fd.c | 8 |
1 files changed, 8 insertions, 0 deletions
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) | |||
876 | 876 | ||
877 | p9_mux_poll_stop(m); | 877 | p9_mux_poll_stop(m); |
878 | cancel_work_sync(&m->rq); | 878 | cancel_work_sync(&m->rq); |
879 | if (m->rreq) { | ||
880 | p9_req_put(m->rreq); | ||
881 | m->rreq = NULL; | ||
882 | } | ||
879 | cancel_work_sync(&m->wq); | 883 | cancel_work_sync(&m->wq); |
884 | if (m->wreq) { | ||
885 | p9_req_put(m->wreq); | ||
886 | m->wreq = NULL; | ||
887 | } | ||
880 | 888 | ||
881 | p9_conn_cancel(m, -ECONNRESET); | 889 | p9_conn_cancel(m, -ECONNRESET); |
882 | 890 | ||