[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20071204185214.GA6658@iris.sw.ru>
Date: Tue, 4 Dec 2007 21:52:14 +0300
From: "Denis V. Lunev" <den@...nvz.org>
To: davem@...emloft.net
Cc: devel@...nvz.org, netdev@...r.kernel.org, containers@...ts.osdl.org
Subject: [PATCH 4/4] netns: prevent usage of flowi with not initialized
fl_net in routing (v2)
Notify that flowi with not initialized fl_net is used. This is a temporary
measure to simplify maintenance of the patchset.
Changes from v1:
- changed BUG_ON to WARN_ON. Thanks to Patrick McHardy
Signed-off-by: Denis V. Lunev <den@...nvz.org>
---
net/ipv4/route.c | 1 +
net/ipv6/fib6_rules.c | 1 +
net/ipv6/ip6_fib.c | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 84a7f32..996fd9e 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2444,6 +2444,7 @@ int ip_route_output_flow(struct rtable **rp, struct flowi *flp, struct sock *sk,
{
int err;
+ WARN_ON(flp->fl_net == NULL);
if ((err = __ip_route_output_key(rp, flp)) != 0)
return err;
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 428c6b0..326ea69 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -38,6 +38,7 @@ struct dst_entry *fib6_rule_lookup(struct flowi *fl, int flags,
.lookup_ptr = lookup,
};
+ WARN_ON(fl->fl_net == NULL);
fib_rules_lookup(&fib6_rules_ops, fl, flags, &arg);
if (arg.rule)
fib_rule_put(arg.rule);
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 31b60a0..706cb72 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -282,6 +282,7 @@ struct fib6_table *fib6_get_table(u32 id)
struct dst_entry *fib6_rule_lookup(struct flowi *fl, int flags,
pol_lookup_t lookup)
{
+ WARN_ON(fl->fl_net == NULL);
return (struct dst_entry *) lookup(&fib6_main_tbl, fl, flags);
}
--
1.5.3.rc5
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists