diff options
| author | Brian Haley <brian.haley@hp.com> | 2008-08-14 15:33:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-14 15:33:21 -0700 |
| commit | 191cd582500f49b32a63040fedeebb0168c720af (patch) | |
| tree | 173ce9682d77798c6e4ca7e14af57ea2f46c55b8 /net/ipv6/xfrm6_policy.c | |
| parent | 0eb8b1fe9238ca4c1797e4c105d5790abda1726f (diff) | |
| download | kernel-common-191cd582500f49b32a63040fedeebb0168c720af.tar.gz kernel-common-191cd582500f49b32a63040fedeebb0168c720af.tar.bz2 kernel-common-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/xfrm6_policy.c')
| -rw-r--r-- | net/ipv6/xfrm6_policy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 8f1e0543b3c4..08e4cbbe3f04 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -52,12 +52,14 @@ static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr, static int xfrm6_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr) { struct dst_entry *dst; + struct net_device *dev; dst = xfrm6_dst_lookup(0, NULL, daddr); if (IS_ERR(dst)) return -EHOSTUNREACH; - ipv6_dev_get_saddr(ip6_dst_idev(dst)->dev, + dev = ip6_dst_idev(dst)->dev; + ipv6_dev_get_saddr(dev_net(dev), dev, (struct in6_addr *)&daddr->a6, 0, (struct in6_addr *)&saddr->a6); dst_release(dst); |