diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-28 16:33:06 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-28 16:33:06 +0100 |
| commit | 4e8f2fc1a55d543717efb70e170b09e773d0542b (patch) | |
| tree | 30df1d7fc9dfa24fe2916711a17656682c3f7ec9 /net/sctp/socket.c | |
| parent | net: adjust skb->truesize in pskb_expand_head() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-4e8f2fc1a55d543717efb70e170b09e773d0542b.tar.xz linux-4e8f2fc1a55d543717efb70e170b09e773d0542b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two trivial overlapping changes conflicts in MPLS and mlx5.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index d699d2cbf275..5fc7122c76de 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -235,8 +235,12 @@ static struct sctp_transport *sctp_addr_id2transport(struct sock *sk, sctp_assoc_t id) { struct sctp_association *addr_asoc = NULL, *id_asoc = NULL; - struct sctp_transport *transport; + struct sctp_af *af = sctp_get_af_specific(addr->ss_family); union sctp_addr *laddr = (union sctp_addr *)addr; + struct sctp_transport *transport; + + if (sctp_verify_addr(sk, laddr, af->sockaddr_len)) + return NULL; addr_asoc = sctp_endpoint_lookup_assoc(sctp_sk(sk)->ep, laddr, |