summaryrefslogtreecommitdiff
path: root/net/sctp
diff options
context:
space:
mode:
authorBrian Haley <brian.haley@hp.com>2008-08-14 15:33:21 -0700
committerDavid S. Miller <davem@davemloft.net>2008-08-14 15:33:21 -0700
commit191cd582500f49b32a63040fedeebb0168c720af (patch)
tree173ce9682d77798c6e4ca7e14af57ea2f46c55b8 /net/sctp
parent0eb8b1fe9238ca4c1797e4c105d5790abda1726f (diff)
downloadlinux-3.10-191cd582500f49b32a63040fedeebb0168c720af.tar.gz
linux-3.10-191cd582500f49b32a63040fedeebb0168c720af.tar.bz2
linux-3.10-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/sctp')
-rw-r--r--net/sctp/ipv6.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 483a01d0740..47f91afa021 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -319,7 +319,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
__func__, asoc, dst, NIP6(daddr->v6.sin6_addr));
if (!asoc) {
- ipv6_dev_get_saddr(dst ? ip6_dst_idev(dst)->dev : NULL,
+ ipv6_dev_get_saddr(sock_net(sctp_opt2sk(sk)),
+ dst ? ip6_dst_idev(dst)->dev : NULL,
&daddr->v6.sin6_addr,
inet6_sk(&sk->inet.sk)->srcprefs,
&saddr->v6.sin6_addr);