* [PATCH net-2.6.26][IPV6]: Fix potential net leak and oops in ipv6 routing code.
@ 2008-03-26 15:55 Pavel Emelyanov
2008-03-26 15:59 ` Daniel Lezcano
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Emelyanov @ 2008-03-26 15:55 UTC (permalink / raw)
To: David Miller; +Cc: Daniel Lezcano, Linux Netdev List, devel
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: Pavel Emelyanov <xemul@openvz.org>
---
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index ac44283..cd82b6d 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -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)
{
+ int err;
struct net *net = get_proc_net(inode);
if (!net)
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)
@@ -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)
{
+ int err;
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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-2.6.26][IPV6]: Fix potential net leak and oops in ipv6 routing code.
2008-03-26 15:55 [PATCH net-2.6.26][IPV6]: Fix potential net leak and oops in ipv6 routing code Pavel Emelyanov
@ 2008-03-26 15:59 ` Daniel Lezcano
2008-03-26 23:50 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Lezcano @ 2008-03-26 15:59 UTC (permalink / raw)
To: Pavel Emelyanov; +Cc: David Miller, Linux Netdev List, devel
Pavel Emelyanov wrote:
> 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: Pavel Emelyanov <xemul@openvz.org>
>
> ---
>
> diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> index ac44283..cd82b6d 100644
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -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)
> {
> + int err;
> struct net *net = get_proc_net(inode);
> if (!net)
> 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)
> @@ -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)
> {
> + int err;
> 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)
Good catch. Thanks.
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-2.6.26][IPV6]: Fix potential net leak and oops in ipv6 routing code.
2008-03-26 15:59 ` Daniel Lezcano
@ 2008-03-26 23:50 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2008-03-26 23:50 UTC (permalink / raw)
To: dlezcano; +Cc: xemul, netdev, devel
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Wed, 26 Mar 2008 16:59:29 +0100
> Pavel Emelyanov wrote:
> > 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: Pavel Emelyanov <xemul@openvz.org>
...
> Good catch. Thanks.
>
> Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Applied, thanks everyone!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-03-26 23:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-26 15:55 [PATCH net-2.6.26][IPV6]: Fix potential net leak and oops in ipv6 routing code Pavel Emelyanov
2008-03-26 15:59 ` Daniel Lezcano
2008-03-26 23:50 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).