diff options
author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2007-05-04 16:34:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-05-04 16:34:09 -0400 |
commit | 16d00fb7765a43a1b05989062e985d283b3a1f2d (patch) | |
tree | 8395f341ee34c1bb57433253eb6b722b5644665c /net/sctp | |
parent | 5a6d34162f5c6f522f857df274f1c8240f161e11 (diff) |
[SCTP]: Verify all destination ports in sctp_connectx.
We need to make sure that all destination ports are the same, since
the association really must not connect to multiple different ports
at once. This was reported on the sctp-impl list.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/socket.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 2fc0a92caa78..b2ffab62a229 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -972,6 +972,7 @@ static int __sctp_connect(struct sock* sk, | |||
972 | int walk_size = 0; | 972 | int walk_size = 0; |
973 | union sctp_addr *sa_addr; | 973 | union sctp_addr *sa_addr; |
974 | void *addr_buf; | 974 | void *addr_buf; |
975 | unsigned short port; | ||
975 | 976 | ||
976 | sp = sctp_sk(sk); | 977 | sp = sctp_sk(sk); |
977 | ep = sp->ep; | 978 | ep = sp->ep; |
@@ -992,6 +993,7 @@ static int __sctp_connect(struct sock* sk, | |||
992 | while (walk_size < addrs_size) { | 993 | while (walk_size < addrs_size) { |
993 | sa_addr = (union sctp_addr *)addr_buf; | 994 | sa_addr = (union sctp_addr *)addr_buf; |
994 | af = sctp_get_af_specific(sa_addr->sa.sa_family); | 995 | af = sctp_get_af_specific(sa_addr->sa.sa_family); |
996 | port = ntohs(sa_addr->v4.sin_port); | ||
995 | 997 | ||
996 | /* If the address family is not supported or if this address | 998 | /* If the address family is not supported or if this address |
997 | * causes the address buffer to overflow return EINVAL. | 999 | * causes the address buffer to overflow return EINVAL. |
@@ -1005,6 +1007,12 @@ static int __sctp_connect(struct sock* sk, | |||
1005 | if (err) | 1007 | if (err) |
1006 | goto out_free; | 1008 | goto out_free; |
1007 | 1009 | ||
1010 | /* Make sure the destination port is correctly set | ||
1011 | * in all addresses. | ||
1012 | */ | ||
1013 | if (asoc && asoc->peer.port && asoc->peer.port != port) | ||
1014 | goto out_free; | ||
1015 | |||
1008 | memcpy(&to, sa_addr, af->sockaddr_len); | 1016 | memcpy(&to, sa_addr, af->sockaddr_len); |
1009 | 1017 | ||
1010 | /* Check if there already is a matching association on the | 1018 | /* Check if there already is a matching association on the |