Commit 59cc46ef authored by Mirko Bonadei's avatar Mirko Bonadei Committed by Chromium LUCI CQ

Revert "Roll src/third_party/usrsctp/usrsctplib/ 995c0b844..4191ca178 (72 commits)"

This reverts commit 5903b6b1.

Reason for revert: This should land after M89 is branched.

Original change's description:
> Roll src/third_party/usrsctp/usrsctplib/ 995c0b844..4191ca178 (72 commits)
>
> https://chromium.googlesource.com/external/github.com/sctplab/usrsctp/+log/995c0b844144..4191ca1784d8
>
> $ git log 995c0b844..4191ca178 --date=short --no-merges --format='%ad %ae %s'
> 2021-01-04 vitaly Fixed installation on other than Ubuntu GNU/Linux distributions. (#541)
> 2021-01-01 tuexen Improve handling of aborted associations
> 2020-12-31 yuquanw2 Add SACK into fuzzer_fragment (#516)
> 2020-12-31 61293369+ihsinme Update client_upcall.c (#559)
> 2020-12-30 deadbeef Add optional SCTP_USE_OPENSSL_RAND define to use openssll's RNG. (#558)
> 2020-12-30 deadbeef Lowercase reference to iphlpapi.lib (#560)
> 2020-12-23 tuexen Improve input validation for parameters in ASCONF and ASCONF-ACK chunks
> 2020-12-20 deadbeef Fall back to using urandom on Linux if getrandom isn't available. (#557)
> 2020-12-14 tuexen Harden the handling of outgoing streams in case of an restart or INIT collision. This avouds an out-of-bounce access in case the peer can break the cookie signature. Thanks to Felix Wilhelm from Google for reporting the issue.
> 2020-12-12 tuexen Clean up more resouces of an existing SCTP association in case of a restart.
> 2020-11-19 weinrank Sync master with fuzzing branch (#551)
> 2020-11-18 CoolmanCZ MinGW release build - initialize variables (#548)
> 2020-11-18 deadbeef Call __msan_unpoison after syscall(__NR_getrandom, ...). (#550)
> 2020-11-18 deadbeef Support building with emscripten. (#549)
> 2020-11-18 sironhide0null Fix a typo in user_mbuf.c (#552)
> 2020-11-09 tuexen Fix a potential use-after-free bug introduced in https://github.com/sctplab/usrsctp/commit/b10a5d3b26e94320232dbdf269873497f8f7cff1.
> 2020-11-04 weinrank Fix #545 - remove .lib extension (#546)
> 2020-11-02 weinrank Use CMAKE's BUILD_SHARED_LIBS flag to build shared library (#543)
> 2020-10-22 tuexen Use the SCTP_REUSE_PORT socket option.
> 2020-10-17 tuexen Improve the handling of cookie life times. The staleness reported in an error cause is in us, not ms. Enforce limits on the life time via sysct; and socket options consistently. Update the description of the sysctl variable to use the right unit. Also do some minor cleanups. This also fixes an interger overflow issue if the peer can modify the cookie. This was reported by Felix Weinrank by fuzz testing the userland stack and in https://oss-fuzz.com/testcase-detail/4800394024452096
> 2020-10-13 tuexen Improve compilation on Windows.
> 2020-10-07 tuexen Whitespace changes
> 2020-10-06 tuexen Reset delayed SACK state when restarting an SCTP association
> 2020-10-06 tuexen Cleanup.
> 2020-10-06 tuexen Accept any cookie if FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION is defined.
> 2020-10-06 tuexen Provide RNG for __native_client__ as suggested by Taylor Brandstetter. Fail compilation on all platforms we don't have a specific RNG for.
> 2020-10-06 tuexen terminate_non_graceful() never returns...
> 2020-10-06 tuexen Initialize variables before using
> 2020-10-06 tuexen Remove dead stores reported by clang
> 2020-10-06 tuexen Cleanup
> 2020-10-06 tuexen Whitespace changes
> 2020-10-04 tuexen Use __func__ instead of __FUNCTION__
> 2020-10-04 tuexen Cleanup. No functional change intended
> 2020-10-02 tuexen Minor cleanup.
> 2020-10-01 deadbeef Call getrandom via syscall directly on Linux. (#533)
> 2020-10-01 tuexen I guess Bitrig support arc4random().
> 2020-10-01 tuexen Whitespace change.
> 2020-10-01 tuexen Don't start SCTP/UDP receive threads (and don't open corresponding UDP sockets) when the UDP port specified in scpt_init() is 0.
> 2020-09-30 deadbeef Add missing return type to init_random. (#531)
> 2020-09-30 tuexen Try to fix the Windows build.
> 2020-09-30 tuexen Add Android specific code for the random number generator.
> 2020-09-30 tuexen Add platform specifc includes to the corresponding code.
> 2020-09-30 tuexen Add a cleanup routine for the random number generator.
> 2020-09-29 tuexen Improve the input validation and processing of cookies.
> 2020-09-28 tuexen Whitespace cleanup
> 2020-09-28 tuexen Improve random number generation on __Fuchsia__.
> 2020-09-27 tuexen Improve the handling of fragmented, unordered, and unreliable user data using DATA chunks in the receive path.
> 2020-09-26 tuexen Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25984
> 2020-09-24 tuexen Whitespace changes
> 2020-09-22 deadbeef Avoid duplicate definition of _CRT_RAND_S. (#529)
> 2020-09-22 deadbeef Fix gcc/clang type mismatch warnings on Windows (#527)
> 2020-09-22 deadbeef Fix -Wunreachable-code in programs/ (#528)
> 2020-09-19 tuexen Improve consistency.
> 2020-09-19 tuexen Cleanup.
> 2020-09-19 tuexen Improve Windows build.
> 2020-09-19 tuexen Fix syntax error on windows.
> 2020-09-19 tuexen Add include for getrandom() on Linux.
> 2020-09-19 tuexen Fix type of init_random() on Linux and Windows.
> 2020-09-19 tuexen Improve Windows build.
> 2020-09-19 tuexen Improve consistency.
> 2020-09-19 tuexen Improve random number generation on Linux and Windows.
> 2020-09-19 tuexen Cleanup read_random(). No functional change.
> 2020-09-19 tuexen Fix NetBSD related #ifdef.
> 2020-09-19 tuexen Whitespace changes
> 2020-09-18 tuexen Add license.
> 2020-09-18 tuexen Add license statement.
> 2020-09-18 tuexen Fox more typos.
> 2020-09-18 tuexen Fix typo.
> 2020-09-18 tuexen Remove trailing whitspaces.
> 2020-09-18 tuexen Improve consistency, no functional change intended.
> 2020-09-18 tuexen Check for too short packets when using the receive threads.
> 2020-09-18 tuexen Fix mask for ECN bits.
>
> Created with:
>   roll-dep src/third_party/usrsctp/usrsctplib
>
> Bug: chromium:1163228
> Change-Id: I9b0b5f8c98bf3f7c9f51ae6fae24dd0e9b6e3117
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2612384
> Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
> Reviewed-by: Harald Alvestrand <hta@chromium.org>
> Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#841036}

TBR=hta@chromium.org,deadbeef@chromium.org,mbonadei@chromium.org,orphis@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: Ifd8bf7e7fb5a50cdc4fb4b128895bc34425f127a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:1163228
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617778Reviewed-by: default avatarMirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841408}
parent 5d18a0ed
...@@ -1483,7 +1483,7 @@ deps = { ...@@ -1483,7 +1483,7 @@ deps = {
}, },
'src/third_party/usrsctp/usrsctplib': 'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '4191ca1784d8774dbf62d48ab9426c7311a91bc5', Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '2c26785bed47cf18e127c516ab242b4e3781ed20',
'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@ffb3b84133b03dfc4b83a8430a418f4fa94308d8', 'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@ffb3b84133b03dfc4b83a8430a418f4fa94308d8',
......
...@@ -105,7 +105,6 @@ static_library("usrsctp") { ...@@ -105,7 +105,6 @@ static_library("usrsctp") {
"SCTP_PROCESS_LEVEL_LOCKS", "SCTP_PROCESS_LEVEL_LOCKS",
"SCTP_SIMPLE_ALLOCATOR", "SCTP_SIMPLE_ALLOCATOR",
"SCTP_USE_OPENSSL_SHA1", "SCTP_USE_OPENSSL_SHA1",
"SCTP_USE_OPENSSL_RAND",
"__Userspace__", "__Userspace__",
# "SCTP_DEBUG", # Uncomment for SCTP debugging. # "SCTP_DEBUG", # Uncomment for SCTP debugging.
...@@ -129,13 +128,26 @@ static_library("usrsctp") { ...@@ -129,13 +128,26 @@ static_library("usrsctp") {
] ]
if (is_linux || is_chromeos || is_android) { if (is_linux || is_chromeos || is_android) {
defines += [ "_GNU_SOURCE" ] defines += [
"__Userspace_os_Linux",
"_GNU_SOURCE",
]
} else if (is_apple) { } else if (is_apple) {
defines += [ defines += [
"HAVE_SA_LEN", "HAVE_SA_LEN",
"__APPLE_USE_RFC_2292", "__APPLE_USE_RFC_2292",
"__Userspace_os_Darwin",
] ]
} }
if (is_win) {
defines += [ "__Userspace_os_Windows" ]
} else {
defines += [ "NON_WINDOWS_DEFINE" ]
}
if (is_fuchsia) {
defines += [ "__Userspace_os_Fuchsia" ]
}
deps = [ "//third_party/boringssl" ] deps = [ "//third_party/boringssl" ]
} }
...@@ -2,8 +2,8 @@ Name: usrsctp ...@@ -2,8 +2,8 @@ Name: usrsctp
URL: http://github.com/sctplab/usrsctp URL: http://github.com/sctplab/usrsctp
Version: 0 Version: 0
CPEPrefix: cpe:/a:usrsctp_project:usrsctp:2019-12-20 CPEPrefix: cpe:/a:usrsctp_project:usrsctp:2019-12-20
Date: Jan 5, 2021 Date: Aug 28, 2020
Revision: 4191ca1784d8774dbf62d48ab9426c7311a91bc5 Revision: 995c0b84414466d77d52011e5b572cbe213b770a
License: New BSD License: New BSD
License File: LICENSE License File: LICENSE
Security Critical: yes Security Critical: yes
...@@ -19,3 +19,6 @@ as well as updates and enhancements from the following Internet Drafts: ...@@ -19,3 +19,6 @@ as well as updates and enhancements from the following Internet Drafts:
draft-stewart-prsctp-00.txt draft-stewart-prsctp-00.txt
draft-stewart-tsvwg-sctpipv6-00.txt draft-stewart-tsvwg-sctpipv6-00.txt
draft-iyengar-sctp-cacc-00.txt draft-iyengar-sctp-cacc-00.txt
Local Modifications:
Cherry picked d844a690d30ace22de75e8b80d9bb08ae7283795
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment