diff options
author | Xin Long <lucien.xin@gmail.com> | 2016-10-31 08:32:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-10-31 16:20:32 -0400 |
commit | 7c17fcc726903ffed1716351efdc617e752533ed (patch) | |
tree | 92cf1642e495a8bec72484f97fdd9603c8c5adfb | |
parent | cd26da4ff4eb7189921d4e7ad87e8adebb7b416b (diff) |
sctp: return back transport in __sctp_rcv_init_lookup
Prior to this patch, it used a local variable to save the transport that is
looked up by __sctp_lookup_association(), and didn't return it back. But in
sctp_rcv, it is used to initialize chunk->transport. So when hitting this,
even if it found the transport, it was still initializing chunk->transport
with null instead.
This patch is to return the transport back through transport pointer
that is from __sctp_rcv_lookup_harder().
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/sctp/input.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c index a2ea1d1cc06a..8e0bc58eec20 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c | |||
@@ -1021,7 +1021,6 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct net *net, | |||
1021 | struct sctphdr *sh = sctp_hdr(skb); | 1021 | struct sctphdr *sh = sctp_hdr(skb); |
1022 | union sctp_params params; | 1022 | union sctp_params params; |
1023 | sctp_init_chunk_t *init; | 1023 | sctp_init_chunk_t *init; |
1024 | struct sctp_transport *transport; | ||
1025 | struct sctp_af *af; | 1024 | struct sctp_af *af; |
1026 | 1025 | ||
1027 | /* | 1026 | /* |
@@ -1052,7 +1051,7 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct net *net, | |||
1052 | 1051 | ||
1053 | af->from_addr_param(paddr, params.addr, sh->source, 0); | 1052 | af->from_addr_param(paddr, params.addr, sh->source, 0); |
1054 | 1053 | ||
1055 | asoc = __sctp_lookup_association(net, laddr, paddr, &transport); | 1054 | asoc = __sctp_lookup_association(net, laddr, paddr, transportp); |
1056 | if (asoc) | 1055 | if (asoc) |
1057 | return asoc; | 1056 | return asoc; |
1058 | } | 1057 | } |