* [PATCH -next] tipc: fix the error handling in tipc_udp_enable()
@ 2016-08-24 13:32 Wei Yongjun
2016-08-25 23:33 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2016-08-24 13:32 UTC (permalink / raw)
To: Jon Maloy, Ying Xue, David S. Miller; +Cc: Wei Yongjun, netdev, tipc-discussion
From: Wei Yongjun <weiyongjun1@huawei.com>
Fix to return a negative error code in enable_mcast() error handling
case, and release udp socket when necessary.
Fixes: d0f91938bede ("tipc: add ip/udp media type")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
net/tipc/udp_media.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
index 33bdf54..453ab0b 100644
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
@@ -396,10 +396,13 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b,
tuncfg.encap_destroy = NULL;
setup_udp_tunnel_sock(net, ub->ubsock, &tuncfg);
- if (enable_mcast(ub, remote))
+ err = enable_mcast(ub, remote);
+ if (err)
goto err;
return 0;
err:
+ if (ub->ubsock)
+ udp_tunnel_sock_release(ub->ubsock);
kfree(ub);
return err;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-25 23:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-24 13:32 [PATCH -next] tipc: fix the error handling in tipc_udp_enable() Wei Yongjun
2016-08-25 23:33 ` 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).