[SCTP]: sctp_endpoint_lookup_assoc() switched to net-endian.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index c543f3250645c432fccfb40076d529c2404f92df..5ffb1af336c0180321a35e5fcf8cc1ad7ed68d18 100644 (file)
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -257,16 +257,14 @@ static struct sctp_association *__sctp_endpoint_lookup_assoc(
        int rport;
        struct sctp_association *asoc;
        struct list_head *pos;
-       union sctp_addr tmp;
-       flip_to_n(&tmp, paddr);
 
-       rport = paddr->v4.sin_port;
+       rport = ntohs(paddr->v4.sin_port);
 
        list_for_each(pos, &ep->asocs) {
                asoc = list_entry(pos, struct sctp_association, asocs);
                if (rport == asoc->peer.port) {
                        sctp_read_lock(&asoc->base.addr_lock);
-                       *transport = sctp_assoc_lookup_paddr(asoc, &tmp);
+                       *transport = sctp_assoc_lookup_paddr(asoc, paddr);
                        sctp_read_unlock(&asoc->base.addr_lock);
 
                        if (*transport)
@@ -348,8 +346,10 @@ static void sctp_endpoint_bh_rcv(struct sctp_endpoint *ep)
                 * COOKIE-ECHO chunk.
                 */
                if (NULL == chunk->asoc) {
+                       union sctp_addr tmp;
+                       flip_to_n(&tmp, sctp_source(chunk));
                        asoc = sctp_endpoint_lookup_assoc(ep,
-                                                         sctp_source(chunk),
+                                                         &tmp,
                                                          &transport);
                        chunk->asoc = asoc;
                        chunk->transport = transport;

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index d09589a51c44b561deb23897929888a1c0e53bc2..6beaa7821ca673d072b93d9b756b741c02948f39 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -228,11 +228,9 @@ static struct sctp_transport *sctp_addr_id2transport(struct sock *sk,
        struct sctp_association *addr_asoc = NULL, *id_asoc = NULL;
        struct sctp_transport *transport;
        union sctp_addr *laddr = (union sctp_addr *)addr;
-       union sctp_addr tmp;
 
-       flip_to_h(&tmp, laddr);
        addr_asoc = sctp_endpoint_lookup_assoc(sctp_sk(sk)->ep,
-                                              &tmp,
+                                              laddr,
                                               &transport);
 
        if (!addr_asoc)
@@ -1007,7 +1005,7 @@ static int __sctp_connect(struct sock* sk,
                /* Check if there already is a matching association on the
                 * endpoint (other than the one created here).
                 */
-               asoc2 = sctp_endpoint_lookup_assoc(ep, &to, &transport);
+               asoc2 = sctp_endpoint_lookup_assoc(ep, sa_addr, &transport);
                if (asoc2 && asoc2 != asoc) {
                        if (asoc2->state >= SCTP_STATE_ESTABLISHED)
                                err = -EISCONN;
@@ -1468,7 +1466,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
        /* If a msg_name has been specified, assume this is to be used.  */
        if (msg_name) {
                /* Look for a matching association on the endpoint. */
-               asoc = sctp_endpoint_lookup_assoc(ep, &to, &transport);
+               asoc = sctp_endpoint_lookup_assoc(ep, &tmp, &transport);
                if (!asoc) {
                        /* If we could not find a matching association on the
                         * endpoint, make sure that it is not a TCP-style