From: Jon Maloy <jon.maloy@ericsson.com>
Date: Mon, 4 Dec 2017 21:00:20 +0000 (+0100)
Subject: tipc: fix memory leak in tipc_accept_from_sock()
X-Git-Tag: v4.4.106~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=827fd89bc552a7ac916707225ca3de1f516d3b9c;p=thirdparty%2Fkernel%2Fstable.git

tipc: fix memory leak in tipc_accept_from_sock()


[ Upstream commit a7d5f107b4978e08eeab599ee7449af34d034053 ]

When the function tipc_accept_from_sock() fails to create an instance of
struct tipc_subscriber it omits to free the already created instance of
struct tipc_conn instance before it returns.

We fix that with this commit.

Reported-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/tipc/server.c b/net/tipc/server.c
index c416e5184a3f2..f351863076c23 100644
--- a/net/tipc/server.c
+++ b/net/tipc/server.c
@@ -311,6 +311,7 @@ static int tipc_accept_from_sock(struct tipc_conn *con)
 	newcon->usr_data = s->tipc_conn_new(newcon->conid);
 	if (!newcon->usr_data) {
 		sock_release(newsock);
+		conn_put(newcon);
 		return -ENOMEM;
 	}