diff options
| author | Brian Haley <brian.haley@hp.com> | 2008-08-15 00:33:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-15 00:33:21 +0200 |
| commit | 191cd582500f49b32a63040fedeebb0168c720af (patch) | |
| tree | 173ce9682d77798c6e4ca7e14af57ea2f46c55b8 /net/ipv6/fib6_rules.c | |
| parent | bnx2: Update version to 1.8.0. (diff) | |
| download | linux-191cd582500f49b32a63040fedeebb0168c720af.tar.xz linux-191cd582500f49b32a63040fedeebb0168c720af.zip | |
netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()
ipv6_dev_get_saddr() blindly de-references dst_dev to get the network
namespace, but some callers might pass NULL. Change callers to pass a
namespace pointer instead.
Signed-off-by: Brian Haley <brian.haley@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/fib6_rules.c')
| -rw-r--r-- | net/ipv6/fib6_rules.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index 8d05527524e3..f5de3f9dc692 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c @@ -93,7 +93,8 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, if (flags & RT6_LOOKUP_F_SRCPREF_COA) srcprefs |= IPV6_PREFER_SRC_COA; - if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev, + if (ipv6_dev_get_saddr(net, + ip6_dst_idev(&rt->u.dst)->dev, &flp->fl6_dst, srcprefs, &saddr)) goto again; |