diff options
| author | Allen Webb <allenwebb@google.com> | 2018-12-04 09:46:35 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-12-06 14:40:52 +0000 |
| commit | fe63e5b773f90c2600e8277e802b1954591209a1 (patch) | |
| tree | 22f646b64382655fb305a57003fd4eee38c6dd3a | |
| parent | 1d8ea65f7e4db0326427c7b03ac91a20dd86be03 (diff) | |
| download | chrome-ec-fe63e5b773f90c2600e8277e802b1954591209a1.tar.gz | |
cr50_fuzz: Re-enable this fuzz target now that chromeos-ec is fixed.
'mem_hash_tree.h' was missing '#define HIDE_EC_STDLIB' before
'dcrypto.h'. This problem was only apparent when -O2 is set.
CQ-DEPEND=CL:1358746
BRANCH=None
BUG=chromium:911310
TEST=USE="ubsan asan fuzzer" ./build_packages \
--board=amd64-generic --skip_chroot_upgrade chromeos-ec
Change-Id: I19d00c165764f80cfa385fb3bed64efc67bfc3f9
Signed-off-by: Allen Webb <allenwebb@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1361680
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/1365645
Reviewed-by: Jett Rink <jettrink@chromium.org>
Commit-Queue: Jett Rink <jettrink@chromium.org>
Tested-by: Jett Rink <jettrink@chromium.org>
Trybot-Ready: Jett Rink <jettrink@chromium.org>
| -rw-r--r-- | fuzz/build.mk | 3 | ||||
| -rw-r--r-- | fuzz/mem_hash_tree.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fuzz/build.mk b/fuzz/build.mk index b03043d6cc..cf2ca5412e 100644 --- a/fuzz/build.mk +++ b/fuzz/build.mk @@ -6,8 +6,7 @@ # fuzzer binaries # -# TODO(crbug.com/911310) Fix the chromeos-ec build before adding cr50_fuzz back. -fuzz-test-list-host = host_command_fuzz +fuzz-test-list-host = cr50_fuzz host_command_fuzz # For fuzzing targets libec.a is built from the ro objects and hides functions # that collide with stdlib. The rw only objects are then linked against libec.a diff --git a/fuzz/mem_hash_tree.h b/fuzz/mem_hash_tree.h index daf1b14b2b..34f4a40f9a 100644 --- a/fuzz/mem_hash_tree.h +++ b/fuzz/mem_hash_tree.h @@ -11,6 +11,7 @@ #include <unordered_map> #include <vector> +#define HIDE_EC_STDLIB #include "board/host/dcrypto.h" #include "fuzz/span.h" |