Commit a2333525 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

[IPV6]: Fix potential net leak and oops in ipv6 routing code.

The commits f3db4851 ([NETNS][IPV6] ip6_fib - fib6_clean_all handle several 
network namespaces) and 69ddb805 ([NETNS][IPV6] route6 - Make proc entry 
/proc/net/rt6_stats per namespace) made some proc files per net.

Both of them introduced potential OOPS - get_proc_net can return NULL, but
this check is lost - and a struct net leak - in case single_open() fails the
previously got net is not put.

Kill all these bugs with one patch.
Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b674e82
...@@ -2390,10 +2390,18 @@ static int ipv6_route_show(struct seq_file *m, void *v) ...@@ -2390,10 +2390,18 @@ static int ipv6_route_show(struct seq_file *m, void *v)
static int ipv6_route_open(struct inode *inode, struct file *file) static int ipv6_route_open(struct inode *inode, struct file *file)
{ {
int err;
struct net *net = get_proc_net(inode); struct net *net = get_proc_net(inode);
if (!net) if (!net)
return -ENXIO; return -ENXIO;
return single_open(file, ipv6_route_show, net);
err = single_open(file, ipv6_route_show, net);
if (err < 0) {
put_net(net);
return err;
}
return 0;
} }
static int ipv6_route_release(struct inode *inode, struct file *file) static int ipv6_route_release(struct inode *inode, struct file *file)
...@@ -2429,8 +2437,18 @@ static int rt6_stats_seq_show(struct seq_file *seq, void *v) ...@@ -2429,8 +2437,18 @@ static int rt6_stats_seq_show(struct seq_file *seq, void *v)
static int rt6_stats_seq_open(struct inode *inode, struct file *file) static int rt6_stats_seq_open(struct inode *inode, struct file *file)
{ {
int err;
struct net *net = get_proc_net(inode); struct net *net = get_proc_net(inode);
return single_open(file, rt6_stats_seq_show, net); if (!net)
return -ENXIO;
err = single_open(file, rt6_stats_seq_show, net);
if (err < 0) {
put_net(net);
return err;
}
return 0;
} }
static int rt6_stats_seq_release(struct inode *inode, struct file *file) static int rt6_stats_seq_release(struct inode *inode, struct file *file)
......
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