Skip to content

Commit 372a804

Browse files
committed
Update trust-dns to fix possible panic (#975)
Our fuzz tests trigger a panic in trust-dns when resolving names through the search path (i.e., in `/etc/hosts`) as described in bluejekyll/trust-dns#1447. This change patches our trust-dns dependencies to use include bluejekyll/trust-dns#6dfc6713 (which has not yet been released to crates.io) Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=33123
1 parent 8c3e39d commit 372a804

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

Cargo.lock

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2353,9 +2353,8 @@ dependencies = [
23532353

23542354
[[package]]
23552355
name = "trust-dns-proto"
2356-
version = "0.20.0"
2357-
source = "registry+https://github.com/rust-lang/crates.io-index"
2358-
checksum = "98a0381b2864c2978db7f8e17c7b23cca5a3a5f99241076e13002261a8ecbabd"
2356+
version = "0.20.1"
2357+
source = "git+https://github.com/bluejekyll/trust-dns?branch=main#6dfc6713fa4448bca3c691aab366a4bae683df65"
23592358
dependencies = [
23602359
"async-trait",
23612360
"cfg-if",
@@ -2371,15 +2370,15 @@ dependencies = [
23712370
"rand",
23722371
"smallvec",
23732372
"thiserror",
2373+
"tinyvec",
23742374
"tokio",
23752375
"url",
23762376
]
23772377

23782378
[[package]]
23792379
name = "trust-dns-resolver"
2380-
version = "0.20.0"
2381-
source = "registry+https://github.com/rust-lang/crates.io-index"
2382-
checksum = "3072d18c10bd621cb00507d59cfab5517862285c353160366e37fbf4c74856e4"
2380+
version = "0.20.1"
2381+
source = "git+https://github.com/bluejekyll/trust-dns?branch=main#6dfc6713fa4448bca3c691aab366a4bae683df65"
23832382
dependencies = [
23842383
"cfg-if",
23852384
"futures-util",

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,6 @@ debug = false
6363
debug = false
6464

6565
[patch.crates-io]
66+
trust-dns-proto = { git = "https://github.com/bluejekyll/trust-dns", branch = "main" }
67+
trust-dns-resolver = { git = "https://github.com/bluejekyll/trust-dns", branch = "main" }
6668
webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.21" }

deny.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ unknown-registry = "deny"
5353
unknown-git = "deny"
5454
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
5555
allow-git = [
56+
"https://github.com/bluejekyll/trust-dns",
5657
"https://github.com/hawkw/tokio-trace",
5758
]
5859

linkerd/dns/fuzz/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ path = "fuzz_targets/fuzz_target_1.rs"
2929
test = false
3030
doc = false
3131
required-features = ["fuzzing"]
32+
33+
[patch.crates-io]
34+
trust-dns-proto = { git = "https://github.com/bluejekyll/trust-dns", branch = "main" }
35+
trust-dns-resolver = { git = "https://github.com/bluejekyll/trust-dns", branch = "main" }

0 commit comments

Comments
 (0)