Title: [258709] branches/safari-609-branch/Source/ThirdParty/libwebrtc
- Revision
- 258709
- Author
- [email protected]
- Date
- 2020-03-19 10:44:19 -0700 (Thu, 19 Mar 2020)
Log Message
Cherry-pick r258690. rdar://problem/60633853
Cherry pick usrsctp commit 790a7a2555aefb392a5a69923f1e9d17b4968467
https://bugs.webkit.org/show_bug.cgi?id=209204
<rdar://problem/59362671>
Patch by Alex Christensen <[email protected]> on 2020-03-19
Reviewed by Youenn Fablet.
* Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c:
* Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258690 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/ThirdParty/libwebrtc/ChangeLog (258708 => 258709)
--- branches/safari-609-branch/Source/ThirdParty/libwebrtc/ChangeLog 2020-03-19 17:44:15 UTC (rev 258708)
+++ branches/safari-609-branch/Source/ThirdParty/libwebrtc/ChangeLog 2020-03-19 17:44:19 UTC (rev 258709)
@@ -1,3 +1,30 @@
+2020-03-19 Russell Epstein <[email protected]>
+
+ Cherry-pick r258690. rdar://problem/60633853
+
+ Cherry pick usrsctp commit 790a7a2555aefb392a5a69923f1e9d17b4968467
+ https://bugs.webkit.org/show_bug.cgi?id=209204
+ <rdar://problem/59362671>
+
+ Patch by Alex Christensen <[email protected]> on 2020-03-19
+ Reviewed by Youenn Fablet.
+
+ * Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c:
+ * Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258690 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-03-19 Alex Christensen <[email protected]>
+
+ Cherry pick usrsctp commit 790a7a2555aefb392a5a69923f1e9d17b4968467
+ https://bugs.webkit.org/show_bug.cgi?id=209204
+ <rdar://problem/59362671>
+
+ Reviewed by Youenn Fablet.
+
+ * Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c:
+ * Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c:
+
2020-01-01 youenn fablet <[email protected]>
Implement transceiver setCodecPreferences
Modified: branches/safari-609-branch/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c (258708 => 258709)
--- branches/safari-609-branch/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c 2020-03-19 17:44:15 UTC (rev 258708)
+++ branches/safari-609-branch/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_auth.c 2020-03-19 17:44:19 UTC (rev 258709)
@@ -34,7 +34,7 @@
#ifdef __FreeBSD__
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctp_auth.c 334532 2018-06-02 16:28:10Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctp_auth.c 355931 2019-12-20 15:25:08Z tuexen $");
#endif
#include <netinet/sctp_os.h>
@@ -1455,7 +1455,8 @@
ptype = ntohs(phdr->param_type);
plen = ntohs(phdr->param_length);
- if ((plen == 0) || (offset + plen > length))
+ if ((plen < sizeof(struct sctp_paramhdr)) ||
+ (offset + plen > length))
break;
if (ptype == SCTP_RANDOM) {
Modified: branches/safari-609-branch/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c (258708 => 258709)
--- branches/safari-609-branch/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c 2020-03-19 17:44:15 UTC (rev 258708)
+++ branches/safari-609-branch/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c 2020-03-19 17:44:19 UTC (rev 258709)
@@ -34,7 +34,7 @@
#ifdef __FreeBSD__
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 334532 2018-06-02 16:28:10Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 355931 2019-12-20 15:25:08Z tuexen $");
#endif
#include <netinet/sctp_os.h>
@@ -7245,7 +7245,7 @@
if (offset + plen > limit) {
break;
}
- if (plen == 0) {
+ if (plen < sizeof(struct sctp_paramhdr)) {
break;
}
#ifdef INET
@@ -7461,6 +7461,9 @@
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,
plen);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
