Skip to content

Commit

Permalink
Merge pull request #2253 from freedomofpress/bump-futures
Browse files Browse the repository at this point in the history 
Upgrade futures- crates to 0.3.31 to fix use after free
  • Loading branch information
@cfm
cfm authored Oct 7, 2024
2 parents 6cfbca4 + d31a0ce commit 0d7ef59
Show file tree
Hide file tree
Showing 3 changed files with 105 additions and 124 deletions.
32 changes: 16 additions & 16 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 49 additions & 0 deletions supply-chain/audits.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,27 +140,76 @@ start = "2023-08-15"
end = "2024-08-29"
notes = "Rust Project member"

[[trusted.futures-channel]]
criteria = "safe-to-deploy"
user-id = 33035 # Taiki Endo (taiki-e)
start = "2020-10-05"
end = "2025-04-07"
notes = "Rust Project member"

[[trusted.futures-core]]
criteria = "safe-to-deploy"
user-id = 33035 # Taiki Endo (taiki-e)
start = "2020-10-05"
end = "2025-04-07"
notes = "Rust Project member"

[[trusted.futures-io]]
criteria = "safe-to-deploy"
user-id = 33035 # Taiki Endo (taiki-e)
start = "2020-10-05"
end = "2024-08-29"
notes = "Rust Project member"

[[trusted.futures-io]]
criteria = "safe-to-deploy"
user-id = 33035 # Taiki Endo (taiki-e)
start = "2020-10-05"
end = "2025-04-07"
notes = "Rust Project member"

[[trusted.futures-macro]]
criteria = "safe-to-deploy"
user-id = 33035 # Taiki Endo (taiki-e)
start = "2020-10-05"
end = "2024-08-29"
notes = "Rust Project member"

[[trusted.futures-macro]]
criteria = "safe-to-deploy"
user-id = 33035 # Taiki Endo (taiki-e)
start = "2020-10-05"
end = "2025-04-07"
notes = "Rust Project member"

[[trusted.futures-sink]]
criteria = "safe-to-deploy"
user-id = 33035 # Taiki Endo (taiki-e)
start = "2020-10-05"
end = "2024-08-29"
notes = "Rust Project member"

[[trusted.futures-sink]]
criteria = "safe-to-deploy"
user-id = 33035 # Taiki Endo (taiki-e)
start = "2020-10-05"
end = "2025-04-07"
notes = "Rust Project member"

[[trusted.futures-task]]
criteria = "safe-to-deploy"
user-id = 33035 # Taiki Endo (taiki-e)
start = "2019-07-29"
end = "2025-04-07"
notes = "Rust Project member"

[[trusted.futures-util]]
criteria = "safe-to-deploy"
user-id = 33035 # Taiki Endo (taiki-e)
start = "2020-10-05"
end = "2025-04-07"
notes = "Rust Project member"

[[trusted.h2]]
criteria = "safe-to-deploy"
user-id = 359 # Sean McArthur (seanmonstar)
Expand Down
148 changes: 40 additions & 108 deletions supply-chain/imports.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,51 @@ user-id = 980
user-login = "Byron"
user-name = "Sebastian Thiel"

[[publisher.futures-channel]]
version = "0.3.31"
when = "2024-10-05"
user-id = 33035
user-login = "taiki-e"
user-name = "Taiki Endo"

[[publisher.futures-core]]
version = "0.3.31"
when = "2024-10-05"
user-id = 33035
user-login = "taiki-e"
user-name = "Taiki Endo"

[[publisher.futures-io]]
version = "0.3.30"
when = "2023-12-24"
version = "0.3.31"
when = "2024-10-05"
user-id = 33035
user-login = "taiki-e"
user-name = "Taiki Endo"

[[publisher.futures-macro]]
version = "0.3.30"
when = "2023-12-24"
version = "0.3.31"
when = "2024-10-05"
user-id = 33035
user-login = "taiki-e"
user-name = "Taiki Endo"

[[publisher.futures-sink]]
version = "0.3.30"
when = "2023-12-24"
version = "0.3.31"
when = "2024-10-05"
user-id = 33035
user-login = "taiki-e"
user-name = "Taiki Endo"

[[publisher.futures-task]]
version = "0.3.31"
when = "2024-10-05"
user-id = 33035
user-login = "taiki-e"
user-name = "Taiki Endo"

[[publisher.futures-util]]
version = "0.3.31"
when = "2024-10-05"
user-id = 33035
user-login = "taiki-e"
user-name = "Taiki Endo"
Expand Down Expand Up @@ -211,13 +239,6 @@ user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.syn]]
version = "2.0.48"
when = "2024-01-04"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.tokio]]
version = "1.36.0"
when = "2024-02-02"
Expand Down Expand Up @@ -600,37 +621,6 @@ that the RNG here is not cryptographically secure.
"""
aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"

[[audits.google.audits.futures-channel]]
who = "George Burgess IV <[email protected]>"
criteria = "safe-to-run"
version = "0.3.28"
aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"

[[audits.google.audits.futures-core]]
who = "George Burgess IV <[email protected]>"
criteria = "safe-to-run"
version = "0.3.28"
aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"

[[audits.google.audits.futures-task]]
who = "George Burgess IV <[email protected]>"
criteria = "safe-to-run"
version = "0.3.28"
aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"

[[audits.google.audits.futures-util]]
who = "George Burgess IV <[email protected]>"
criteria = "safe-to-run"
version = "0.3.28"
notes = """
There's a custom xorshift-based `random::shuffle` implementation in
src/async_await/random.rs. This is `doc(hidden)` and seems to exist just so
that `futures-macro::select` can be unbiased. Sicne xorshift is explicitly not
intended to be a cryptographically secure algorithm, it is not considered
crypto.
"""
aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"

[[audits.google.audits.gimli]]
who = "George Burgess IV <[email protected]>"
criteria = "safe-to-run"
Expand Down Expand Up @@ -910,6 +900,12 @@ delta = "0.4.4 -> 0.5.5"
notes = "Reviewed at https://fxrev.dev/946307"
aggregated-from = "https://fuchsia.googlesource.com/fuchsia/+/refs/heads/main/third_party/rust_crates/supply-chain/audits.toml?format=TEXT"

[[audits.google.audits.syn]]
who = "Ying Hsu <[email protected]>"
criteria = "safe-to-run"
version = "2.0.58"
aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT"

[[audits.google.audits.sync_wrapper]]
who = "ChromeOS"
criteria = "safe-to-run"
Expand Down Expand Up @@ -1259,70 +1255,6 @@ criteria = "safe-to-deploy"
delta = "0.3.3 -> 0.3.8"
aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"

[[audits.zcash.audits.futures-channel]]
who = "Jack Grigg <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.28 -> 0.3.29"
aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"

[[audits.zcash.audits.futures-channel]]
who = "Jack Grigg <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.29 -> 0.3.30"
notes = "Removes `build.rs` now that it can rely on the `target_has_atomic` attribute."
aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"

[[audits.zcash.audits.futures-core]]
who = "Jack Grigg <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.28 -> 0.3.29"
aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"

[[audits.zcash.audits.futures-core]]
who = "Jack Grigg <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.29 -> 0.3.30"
notes = "Removes `build.rs` now that it can rely on the `target_has_atomic` attribute."
aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"

[[audits.zcash.audits.futures-task]]
who = "Jack Grigg <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.28 -> 0.3.29"
aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"

[[audits.zcash.audits.futures-task]]
who = "Jack Grigg <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.29 -> 0.3.30"
notes = "Removes `build.rs` now that it can rely on the `target_has_atomic` attribute."
aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"

[[audits.zcash.audits.futures-util]]
who = "Jack Grigg <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.28 -> 0.3.29"
notes = """
Only change to `unsafe` code is to add a `Fut: Send` bound to the
`unsafe impl Sync for FuturesUnordered<Fut>`.
"""
aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"

[[audits.zcash.audits.futures-util]]
who = "Jack Grigg <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.3.29 -> 0.3.30"
notes = """
- Removes `build.rs` now that it can rely on the `target_has_atomic` attribute.
- Almost all changes to `unsafe` blocks are to either move them around, or
replace them with safe method calls.
- One new `unsafe` block is added for a slice lifetime transmutation. The slice
reconstruction is obviously correct. AFAICT the lifetime transmutation is also
correct; the slice's lifetime logically comes from the `AsyncBufRead` reader
inside `FillBuf`, rather than the `Context`.
"""
aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"

[[audits.zcash.audits.ipnet]]
who = "Jack Grigg <[email protected]>"
criteria = "safe-to-deploy"
Expand Down

0 comments on commit 0d7ef59

Please sign in to comment.