tipc: fix bug on error path in tipc_topsrv_kern_subscr()
Subsystems (3)
PATCH 1/1 tipc: fix bug on error path in tipc_topsrv_kern_subscr()
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 [email protected]
Signed-off-by Jon Maloy <[email protected]>
--- net/tipc/topsrv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/tipc/topsrv.c +4 -3
@@ -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)
Signature · 1 line
2.1.4
From: Jon Maloy <[email protected]>
Date: Mon, 19 Feb 2018 12:48:21 +0100
Quoted 6 lines
In commit
cc1ea9ffadf7("tipc: eliminate structtipc_subscriber") we re-introduced an old bug on the error path in the functiontipc_topsrv_kern_subscr(). We now re-introduce the correction too.Reported-by [email protected]Signed-off-by Jon Maloy <[email protected]>
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