diff options
| author | Jon Maloy <jon.maloy@ericsson.com> | 2017-12-04 22:00:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-17 15:07:56 +0100 |
| commit | 1933fa485194e697b4d90853f338029ab19e4a72 (patch) | |
| tree | 6189cd9de136e046a40b3872c0c6dc3fff03309b /net | |
| parent | 6efcd7eada3e76096e574e27d4e56051ffd328ab (diff) | |
| download | linux-rpi3-1933fa485194e697b4d90853f338029ab19e4a72.tar.gz linux-rpi3-1933fa485194e697b4d90853f338029ab19e4a72.tar.bz2 linux-rpi3-1933fa485194e697b4d90853f338029ab19e4a72.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tipc/server.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/server.c b/net/tipc/server.c index 3cd6402e812c..f4c1b18c5fb0 100644 --- a/net/tipc/server.c +++ b/net/tipc/server.c @@ -313,6 +313,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; } |