Skip to content

Commit 4bfe47a

Browse files
committed
Merge #647: pin memmap2 version above RUSTSEC-2026-0186 fix
3b31e93 pin memmap2 version above RUSTSEC-2026-0186 fix (Jamil Lambert, PhD) 3e07dac Update generate-files.sh (Jamil Lambert, PhD) Pull request description: Pin memmap2 to a safe minimum (>= 0.9.11) for fuzzing builds so the minimum lockfile generation is not the vulnerable 0.9.9 version. Update the lockfiles. Closes #645 ACKs for top commit: satsfy: reACK 3b31e93 tcharding: ACK 3b31e93 Tree-SHA512: 140b18ecd52ffde210b40b72509b1f7cc8d7d0ce865d1ea3e9cc7e08f35bed05d38aa84491be843f41058ce6ab678e2f85f8d7ab31995cc1722aef1825a3f4a6
2 parents 3b0bf7c + 3b31e93 commit 4bfe47a

4 files changed

Lines changed: 19 additions & 11 deletions

File tree

Cargo-minimal.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -573,9 +573,9 @@ checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
573573

574574
[[package]]
575575
name = "honggfuzz"
576-
version = "0.5.58"
576+
version = "0.5.60"
577577
source = "registry+https://github.com/rust-lang/crates.io-index"
578-
checksum = "6e8319f3cc8fe416e7aa1ab95dcc04fd49f35397a47d0b2f0f225f6dba346a07"
578+
checksum = "4d6510a410acedd7a7683b3a45dafdc5ccf3c72d6addaa373497005964fc4e23"
579579
dependencies = [
580580
"lazy_static",
581581
"memmap2",
@@ -661,6 +661,7 @@ version = "0.0.1"
661661
dependencies = [
662662
"honggfuzz",
663663
"jsonrpc",
664+
"memmap2",
664665
"serde",
665666
"serde_json",
666667
]
@@ -708,9 +709,9 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
708709

709710
[[package]]
710711
name = "memmap2"
711-
version = "0.9.9"
712+
version = "0.9.11"
712713
source = "registry+https://github.com/rust-lang/crates.io-index"
713-
checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490"
714+
checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
714715
dependencies = [
715716
"libc",
716717
]

Cargo-recent.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -573,9 +573,9 @@ checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
573573

574574
[[package]]
575575
name = "honggfuzz"
576-
version = "0.5.58"
576+
version = "0.5.60"
577577
source = "registry+https://github.com/rust-lang/crates.io-index"
578-
checksum = "6e8319f3cc8fe416e7aa1ab95dcc04fd49f35397a47d0b2f0f225f6dba346a07"
578+
checksum = "4d6510a410acedd7a7683b3a45dafdc5ccf3c72d6addaa373497005964fc4e23"
579579
dependencies = [
580580
"lazy_static",
581581
"memmap2",
@@ -661,6 +661,7 @@ version = "0.0.1"
661661
dependencies = [
662662
"honggfuzz",
663663
"jsonrpc",
664+
"memmap2",
664665
"serde",
665666
"serde_json",
666667
]
@@ -708,9 +709,9 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
708709

709710
[[package]]
710711
name = "memmap2"
711-
version = "0.9.9"
712+
version = "0.9.11"
712713
source = "registry+https://github.com/rust-lang/crates.io-index"
713-
checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490"
714+
checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
714715
dependencies = [
715716
"libc",
716717
]

fuzz/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jsonrpc = { path = "../jsonrpc", features = ["bitreq_http"] }
1616
serde = { version = "1.0.103", features = [ "derive" ] }
1717
serde_json = "1.0"
1818

19+
[target.'cfg(fuzzing_debug)'.dependencies]
20+
memmap2 = "0.9.11"
21+
1922
[lints.rust]
2023
unexpected_cfgs = { level = "deny", check-cfg = ['cfg(fuzzing)', 'cfg(jsonrpc_fuzz)'] }
2124

fuzz/generate-files.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,16 @@ cargo-fuzz = true
2323
2424
[dependencies]
2525
honggfuzz = { version = "0.5.55", default-features = false }
26-
jsonrpc = { path = "..", features = ["bitreq_http"] }
26+
jsonrpc = { path = "../jsonrpc", features = ["bitreq_http"] }
2727
2828
serde = { version = "1.0.103", features = [ "derive" ] }
2929
serde_json = "1.0"
3030
31+
[target.'cfg(fuzzing_debug)'.dependencies]
32+
memmap2 = "0.9.11"
33+
3134
[lints.rust]
32-
unexpected_cfgs = { level = "deny", check-cfg = ['cfg(fuzzing)'] }
35+
unexpected_cfgs = { level = "deny", check-cfg = ['cfg(fuzzing)', 'cfg(jsonrpc_fuzz)'] }
3336
EOF
3437

3538
for targetFile in $(listTargetFiles); do
@@ -80,7 +83,7 @@ $(for name in $(listTargetNames); do echo " $name,"; done)
8083
key: cache-\${{ matrix.target }}-\${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
8184
- uses: dtolnay/rust-toolchain@stable
8285
with:
83-
toolchain: '1.65.0'
86+
toolchain: '1.75.0'
8487
- name: fuzz
8588
run: |
8689
if [[ "\${{ matrix.fuzz_target }}" =~ ^bitcoin ]]; then

0 commit comments

Comments
 (0)