diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-28 15:34:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-28 15:34:50 -0700 |
| commit | f9beb95e6a2669fa35e34a6ff52808b181efa20f (patch) | |
| tree | b08b00cc08cbff3c1b2e55979fc72f7e31dfa6f1 /net/sctp/protocol.c | |
| parent | 9ea3e52c5bc8bb4a084938dc1e3160643438927a (diff) | |
| parent | ef6c8d6ccf0c1dccdda092ebe8782777cd7803c9 (diff) | |
Merge branch 'sctp-size-validations'
Marcelo Ricardo Leitner says:
====================
sctp: add some size validations
Ilja Van Sprundel reported that some size validations on inbound
SCTP packets were missing. After some code review, I noticed two
others that are all fixed here.
Thanks Ilja for reporting this.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/protocol.c')
| -rw-r--r-- | net/sctp/protocol.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 6f2bbfeec3a4..25192b378e2e 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -254,14 +254,19 @@ static void sctp_v4_to_sk_daddr(union sctp_addr *addr, struct sock *sk) } /* Initialize a sctp_addr from an address parameter. */ -static void sctp_v4_from_addr_param(union sctp_addr *addr, +static bool sctp_v4_from_addr_param(union sctp_addr *addr, union sctp_addr_param *param, __be16 port, int iif) { + if (ntohs(param->v4.param_hdr.length) < sizeof(struct sctp_ipv4addr_param)) + return false; + addr->v4.sin_family = AF_INET; addr->v4.sin_port = port; addr->v4.sin_addr.s_addr = param->v4.addr.s_addr; memset(addr->v4.sin_zero, 0, sizeof(addr->v4.sin_zero)); + + return true; } /* Initialize an address parameter from a sctp_addr and return the length |