diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-03-18 11:11:13 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 13:09:51 +0200 |
| commit | 4adf0d09f770fb6b7211c1f4a262538cac68135e (patch) | |
| tree | a219071a56e5a121160b7d8155c472b42b122943 /netwerk/sctp/src/netinet/sctp_pcb.c | |
| parent | 22d0b88e375ea3378ec397dc744d36c10112861c (diff) | |
| download | UXP-4adf0d09f770fb6b7211c1f4a262538cac68135e.tar UXP-4adf0d09f770fb6b7211c1f4a262538cac68135e.tar.gz UXP-4adf0d09f770fb6b7211c1f4a262538cac68135e.tar.lz UXP-4adf0d09f770fb6b7211c1f4a262538cac68135e.tar.xz UXP-4adf0d09f770fb6b7211c1f4a262538cac68135e.zip | |
[network] Cherry-pick various sctp lib upstream fixes.
Diffstat (limited to 'netwerk/sctp/src/netinet/sctp_pcb.c')
| -rwxr-xr-x | netwerk/sctp/src/netinet/sctp_pcb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/netwerk/sctp/src/netinet/sctp_pcb.c b/netwerk/sctp/src/netinet/sctp_pcb.c index 58c164f50..ea5725c85 100755 --- a/netwerk/sctp/src/netinet/sctp_pcb.c +++ b/netwerk/sctp/src/netinet/sctp_pcb.c @@ -32,7 +32,7 @@ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 280459 2015-03-24 21:12:45Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 355931 2019-12-20 15:25:08Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -7213,7 +7213,7 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m, if (offset + plen > limit) { break; } - if (plen == 0) { + if (plen < sizeof(struct sctp_paramhdr)) { break; } #ifdef INET @@ -7413,6 +7413,9 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m, if (plen > sizeof(lstore)) { return (-23); } + if (plen < sizeof(struct sctp_asconf_addrv4_param)) { + return (-101); + } phdr = sctp_get_next_param(m, offset, (struct sctp_paramhdr *)&lstore, min(plen,sizeof(lstore))); |