Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f60f577f authored by Tommi Rantala's avatar Tommi Rantala Committed by Greg Kroah-Hartman
Browse files

tipc: error path leak fixes in tipc_enable_bearer() 




[ Upstream commit 19142551b2be4a9e13838099fde1351386e5e007 ]

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>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9868db6

net/tipc/bearer.c

+4 −1
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ static int tipc_enable_bearer(struct net *net, const char *name, 
	if (res) {

		pr_warn("Bearer <%s> rejected, enable failure (%d)\n",

			name, -res);

		kfree(b);

		return -EINVAL;

	}
@@ -345,8 +346,10 @@ static int tipc_enable_bearer(struct net *net, const char *name, 
	if (skb)

		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;

	}



	pr_info("Enabled bearer <%s>, discovery domain %s, priority %u\n",

		name,