SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address
Subsystems (3)
PATCH 1/1 SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address
SCTP_SET_PEER_PRIMARY_ADDR does not accpet v4mapped address, using v4mapped address in SCTP_SET_PEER_PRIMARY_ADDR socket option will get -EADDRNOTAVAIL error if v4map is enabled. This patch try to fix it by mapping v4mapped address to v4 address if allowed.
--- net/sctp/socket.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
net/sctp/socket.c +8 -0
@@ -2932,6 +2932,7 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optvastruct sctp_association *asoc =NULL ;struct sctp_setpeerprim prim;struct sctp_chunk *chunk; +struct sctp_af *af;int err; sp =sctp_sk (sk);
@@ -2959,6 +2960,13 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optvaif (!sctp_state (asoc,ESTABLISHED ))return -ENOTCONN ; + af =sctp_get_af_specific (prim.sspp_addr.ss_family); +if (!af) +return -EINVAL ; + +if (!af->addr_valid ((union sctp_addr *)&prim.sspp_addr, sp,NULL )) +return -EADDRNOTAVAIL ; +if (!sctp_assoc_lookup_laddr (asoc, (union sctp_addr *)&prim.sspp_addr))return -EADDRNOTAVAIL ;
David Miller
maintainerFrom: Wei Yongjun <[email protected]>
Date: Wed, 08 Dec 2010 11:11:09 +0800
Quoted 6 lines
SCTP_SET_PEER_PRIMARY_ADDRdoes not accpet v4mapped address, using v4mapped address inSCTP_SET_PEER_PRIMARY_ADDRsocket option will get-EADDRNOTAVAILerror if v4map is enabled. This patch try to fix it by mapping v4mapped address to v4 address if allowed.Signed-off-by Wei Yongjun <[email protected]>
Vlad and other SCTP folks, please review this patch.
Quoted 6 lines · Wei Yongjun
SCTP_SET_PEER_PRIMARY_ADDRdoes not accpet v4mapped address, using v4mapped address inSCTP_SET_PEER_PRIMARY_ADDRsocket option will get-EADDRNOTAVAILerror if v4map is enabled. This patch try to fix it by mapping v4mapped address to v4 address if allowed.Signed-off-by Wei Yongjun <[email protected]>
Looks good.
-vlad
Quoted 32 lines
--- net/sctp/socket.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)net/sctp/socket.c +8
-0@@ -2932,6 +2932,7 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optvastruct sctp_association *asoc =NULL ;struct sctp_setpeerprim prim;struct sctp_chunk *chunk; +struct sctp_af *af;int err; sp =sctp_sk (sk);@@ -2959,6 +2960,13 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optvaif (!sctp_state (asoc,ESTABLISHED ))return -ENOTCONN ; + af =sctp_get_af_specific (prim.sspp_addr.ss_family); +if (!af) +return -EINVAL ; + +if (!af->addr_valid ((union sctp_addr *)&prim.sspp_addr, sp,NULL )) +return -EADDRNOTAVAIL ; +if (!sctp_assoc_lookup_laddr (asoc, (union sctp_addr *)&prim.sspp_addr))return -EADDRNOTAVAIL ;
From: Vladislav Yasevich <[email protected]>
Date: Fri, 10 Dec 2010 18:13:58 -0500
Quoted 11 lines · Wei Yongjun
Quoted 6 lines
SCTP_SET_PEER_PRIMARY_ADDRdoes not accpet v4mapped address, using v4mapped address inSCTP_SET_PEER_PRIMARY_ADDRsocket option will get-EADDRNOTAVAILerror if v4map is enabled. This patch try to fix it by mapping v4mapped address to v4 address if allowed.Signed-off-by Wei Yongjun <[email protected]>Looks good.
Acked-by Vlad Yasevich <[email protected]>
Applied, thanks everyone.