Commit 19142551 authored by Tommi Rantala's avatar Tommi Rantala Committed by David S. Miller

tipc: error path leak fixes in tipc_enable_bearer()

Fix memory leak in tipc_enable_bearer() if enable_media() fails, and
cleanup with bearer_disable() if tipc_mon_create() fails.
Acked-by: default avatarYing Xue <ying.xue@windriver.com>
Acked-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarTommi Rantala <tommi.t.rantala@nokia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14e138a8
...@@ -324,6 +324,7 @@ static int tipc_enable_bearer(struct net *net, const char *name, ...@@ -324,6 +324,7 @@ static int tipc_enable_bearer(struct net *net, const char *name,
if (res) { if (res) {
pr_warn("Bearer <%s> rejected, enable failure (%d)\n", pr_warn("Bearer <%s> rejected, enable failure (%d)\n",
name, -res); name, -res);
kfree(b);
return -EINVAL; return -EINVAL;
} }
...@@ -347,8 +348,10 @@ static int tipc_enable_bearer(struct net *net, const char *name, ...@@ -347,8 +348,10 @@ static int tipc_enable_bearer(struct net *net, const char *name,
if (skb) if (skb)
tipc_bearer_xmit_skb(net, bearer_id, skb, &b->bcast_addr); tipc_bearer_xmit_skb(net, bearer_id, skb, &b->bcast_addr);
if (tipc_mon_create(net, bearer_id)) if (tipc_mon_create(net, bearer_id)) {
bearer_disable(net, b);
return -ENOMEM; return -ENOMEM;
}
pr_info("Enabled bearer <%s>, discovery domain %s, priority %u\n", pr_info("Enabled bearer <%s>, discovery domain %s, priority %u\n",
name, name,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment