* [net-next 1/1] tipc: fix bug on error path in tipc_topsrv_kern_subscr()
@ 2018-02-19 11:48 Jon Maloy
2018-02-19 19:39 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jon Maloy @ 2018-02-19 11:48 UTC (permalink / raw)
To: davem, netdev
Cc: mohan.krishna.ghanta.krishnamurthy, tung.q.nguyen, hoang.h.le,
jon.maloy, canh.d.luu, ying.xue, tipc-discussion
In commit cc1ea9ffadf7 ("tipc: eliminate struct tipc_subscriber") we
re-introduced an old bug on the error path in the function
tipc_topsrv_kern_subscr(). We now re-introduce the correction too.
Reported-by: syzbot+f62e0f2a0ef578703946@syzkaller.appspotmail.com
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
---
net/tipc/topsrv.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/net/tipc/topsrv.c b/net/tipc/topsrv.c
index 02013e0..25925be 100644
--- a/net/tipc/topsrv.c
+++ b/net/tipc/topsrv.c
@@ -580,9 +580,10 @@ bool tipc_topsrv_kern_subscr(struct net *net, u32 port, u32 type, u32 lower,
*conid = con->conid;
con->sock = NULL;
rc = tipc_conn_rcv_sub(tipc_topsrv(net), con, &sub);
- if (rc < 0)
- tipc_conn_close(con);
- return !rc;
+ if (rc >= 0)
+ return true;
+ conn_put(con);
+ return false;
}
void tipc_topsrv_kern_unsubscr(struct net *net, int conid)
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [net-next 1/1] tipc: fix bug on error path in tipc_topsrv_kern_subscr()
2018-02-19 11:48 [net-next 1/1] tipc: fix bug on error path in tipc_topsrv_kern_subscr() Jon Maloy
@ 2018-02-19 19:39 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2018-02-19 19:39 UTC (permalink / raw)
To: jon.maloy
Cc: netdev, tipc-discussion, hoang.h.le,
mohan.krishna.ghanta.krishnamurthy
From: Jon Maloy <jon.maloy@ericsson.com>
Date: Mon, 19 Feb 2018 12:48:21 +0100
> In commit cc1ea9ffadf7 ("tipc: eliminate struct tipc_subscriber") we
> re-introduced an old bug on the error path in the function
> tipc_topsrv_kern_subscr(). We now re-introduce the correction too.
>
> Reported-by: syzbot+f62e0f2a0ef578703946@syzkaller.appspotmail.com
> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Applied, thanks Jon.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-02-19 19:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-19 11:48 [net-next 1/1] tipc: fix bug on error path in tipc_topsrv_kern_subscr() Jon Maloy
2018-02-19 19:39 ` David Miller
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).