summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDave Johnson <djohnson+linux-kernel@sw.starentnetworks.com>2007-07-25 19:49:29 -0400
committerVlad Yasevich <vladislav.yasevich@hp.com>2007-08-01 11:19:06 -0400
commitb225b884a18a1932db5414abd3ef94a45e4e348e (patch)
treefa4ee9e2f9f5fccae4578e357b62134874da3317 /net
parentcc121fa87a0ce356c23fb4d7358310e747cad8cc (diff)
downloadlinux-3.10-b225b884a18a1932db5414abd3ef94a45e4e348e.tar.gz
linux-3.10-b225b884a18a1932db5414abd3ef94a45e4e348e.tar.bz2
linux-3.10-b225b884a18a1932db5414abd3ef94a45e4e348e.zip
SCTP: IPv4 mapped addr not returned in SCTPv6 accept()
An accept() call on a SCTPv6 socket that returns due to connection of a IPv4 mapped peer will fill out the 'struct sockaddr' with a zero IPv6 address instead of the IPv4 mapped address of the peer. This is due to the v4mapped flag not getting copied into the new socket on accept() as well as a missing check for INET6 socket type in sctp_v4_to_sk_*addr(). Signed-off-by: Dave Johnson <djohnson@sw.starentnetworks.com> Cc: Srinivas Akkipeddi <sakkiped@starentnetworks.com> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Diffstat (limited to 'net')
-rw-r--r--net/sctp/ipv6.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 2c29394fd92..f8aa23dda1c 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -641,6 +641,8 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk,
newsctp6sk = (struct sctp6_sock *)newsk;
inet_sk(newsk)->pinet6 = &newsctp6sk->inet6;
+ sctp_sk(newsk)->v4mapped = sctp_sk(sk)->v4mapped;
+
newinet = inet_sk(newsk);
newnp = inet6_sk(newsk);