[PATCH net] mpls: fix mpls_net_init memory leak

2015-08-31 Thread Nikolay Aleksandrov
From: Nikolay Aleksandrov 

Fix a memory leak in the mpls netns init function in case of failure. If
register_net_sysctl fails then we need to free the ctl_table.

Fixes: 7720c01f3f59 ("mpls: Add a sysctl to control the size of the mpls label 
table")
Signed-off-by: Nikolay Aleksandrov 
---
 net/mpls/af_mpls.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index 1f93a5978f2a..b1faa2dc0e6a 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -1066,8 +1066,10 @@ static int mpls_net_init(struct net *net)
 
table[0].data = net;
net->mpls.ctl = register_net_sysctl(net, "net/mpls", table);
-   if (net->mpls.ctl == NULL)
+   if (net->mpls.ctl == NULL) {
+   kfree(table);
return -ENOMEM;
+   }
 
return 0;
 }
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH net] mpls: fix mpls_net_init memory leak

2015-08-31 Thread David Miller
From: Nikolay Aleksandrov 
Date: Mon, 31 Aug 2015 10:44:19 -0700

> From: Nikolay Aleksandrov 
> 
> Fix a memory leak in the mpls netns init function in case of failure. If
> register_net_sysctl fails then we need to free the ctl_table.
> 
> Fixes: 7720c01f3f59 ("mpls: Add a sysctl to control the size of the mpls 
> label table")
> Signed-off-by: Nikolay Aleksandrov 

Applied, thank you.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html