sctp: Set source addresses on the association before adding transports
Recent commit 8da645e101
sctp: Get rid of an extra routing lookup when adding a transport
introduced a regression in the connection setup. The behavior was
different between IPv4 and IPv6. IPv4 case ended up working because the
route lookup routing returned a NULL route, which triggered another
route lookup later in the output patch that succeeded. In the IPv6 case,
a valid route was returned for first call, but we could not find a valid
source address at the time since the source addresses were not set on the
association yet. Thus resulted in a hung connection.
The solution is to set the source addresses on the association prior to
adding peers.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
d792c1006f
commit
409b95aff3
@@ -384,6 +384,11 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep,
|
||||
if (!new_asoc)
|
||||
goto nomem;
|
||||
|
||||
if (sctp_assoc_set_bind_addr_from_ep(new_asoc,
|
||||
sctp_scope(sctp_source(chunk)),
|
||||
GFP_ATOMIC) < 0)
|
||||
goto nomem_init;
|
||||
|
||||
/* The call, sctp_process_init(), can fail on memory allocation. */
|
||||
if (!sctp_process_init(new_asoc, chunk->chunk_hdr->type,
|
||||
sctp_source(chunk),
|
||||
@@ -401,9 +406,6 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep,
|
||||
len = ntohs(err_chunk->chunk_hdr->length) -
|
||||
sizeof(sctp_chunkhdr_t);
|
||||
|
||||
if (sctp_assoc_set_bind_addr_from_ep(new_asoc, GFP_ATOMIC) < 0)
|
||||
goto nomem_init;
|
||||
|
||||
repl = sctp_make_init_ack(new_asoc, chunk, GFP_ATOMIC, len);
|
||||
if (!repl)
|
||||
goto nomem_init;
|
||||
@@ -1452,6 +1454,10 @@ static sctp_disposition_t sctp_sf_do_unexpected_init(
|
||||
if (!new_asoc)
|
||||
goto nomem;
|
||||
|
||||
if (sctp_assoc_set_bind_addr_from_ep(new_asoc,
|
||||
sctp_scope(sctp_source(chunk)), GFP_ATOMIC) < 0)
|
||||
goto nomem;
|
||||
|
||||
/* In the outbound INIT ACK the endpoint MUST copy its current
|
||||
* Verification Tag and Peers Verification tag into a reserved
|
||||
* place (local tie-tag and per tie-tag) within the state cookie.
|
||||
@@ -1488,9 +1494,6 @@ static sctp_disposition_t sctp_sf_do_unexpected_init(
|
||||
sizeof(sctp_chunkhdr_t);
|
||||
}
|
||||
|
||||
if (sctp_assoc_set_bind_addr_from_ep(new_asoc, GFP_ATOMIC) < 0)
|
||||
goto nomem;
|
||||
|
||||
repl = sctp_make_init_ack(new_asoc, chunk, GFP_ATOMIC, len);
|
||||
if (!repl)
|
||||
goto nomem;
|
||||
|
||||
Reference in New Issue
Block a user