summary refs log tree commit diff
path: root/fuzz
diff options
context:
space:
mode:
authorDaniel Verkamp <dverkamp@chromium.org>2020-03-03 16:13:31 -0800
committerManoj Gupta <manojgupta@chromium.org>2020-03-06 05:26:00 +0000
commit0d2f3d276d5865707a3b31e89a953d4061117ef1 (patch)
tree401efda9f6d40810ce93e8942f422b406f5d3f71 /fuzz
parent29775733653225023cce80915b4f4eefa41c695a (diff)
downloadcrosvm-0d2f3d276d5865707a3b31e89a953d4061117ef1.tar
crosvm-0d2f3d276d5865707a3b31e89a953d4061117ef1.tar.gz
crosvm-0d2f3d276d5865707a3b31e89a953d4061117ef1.tar.bz2
crosvm-0d2f3d276d5865707a3b31e89a953d4061117ef1.tar.lz
crosvm-0d2f3d276d5865707a3b31e89a953d4061117ef1.tar.xz
crosvm-0d2f3d276d5865707a3b31e89a953d4061117ef1.tar.zst
crosvm-0d2f3d276d5865707a3b31e89a953d4061117ef1.zip
fuzz: ensure sys_util path dependency is used
When compiling a new-enough crosvm for fuzzing (after
https://crrev.com/c/1749950), the build would fail with an error about
importing two different version of sys_util:

expected struct `sys_util::shm::SharedMemory`, found a different struct
`sys_util::shm::SharedMemory`
expected reference `sys_util::shm::SharedMemory (struct
`sys_util::shm::SharedMemory`)
found reference sys_util::shm::SharedMemory (struct
`sys_util::shm::SharedMemory`)
perhaps two different versions of crate `sys_util` are being used?

Fix this by patching the version of sys_util used by audio_streams
so that it also uses the path dependency instead of the sys_util from
the dev-rust/sys_util ebuild in the fuzz-specific Cargo.toml.

BUG=chromium:1057532
TEST=`USE='asan fuzzer' emerge-nami crosvm`

Change-Id: I38252465a1111a9a8f643a59e36733016c5db99d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2086401
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Chirantan Ekbote <chirantan@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Diffstat (limited to 'fuzz')
-rw-r--r--fuzz/Cargo.toml3
1 files changed, 3 insertions, 0 deletions
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 1616921..93c2e03 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -42,3 +42,6 @@ path = "virtqueue_fuzzer.rs"
 [[bin]]
 name = "crosvm_zimage_fuzzer"
 path = "zimage_fuzzer.rs"
+
+[patch.crates-io]
+sys_util = { path = "../sys_util" }