Skip to content

Commit

Permalink
Bump FI and adjust the path to main.py in compile (google#8078)
Browse files Browse the repository at this point in the history
* Bump FI and adjust the path to main.py in compile

* Fix llvm build script

* Update FI version

* Update FI version
Navidem authored and MartinPetkov committed Aug 15, 2022

Verified

This commit was signed with the committer’s verified signature.
matthewnessworthy Matthew Nessworthy
1 parent 75843c8 commit 5d4c474
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions infra/base-images/base-builder/compile
Original file line number Diff line number Diff line change
@@ -224,7 +224,7 @@ if [ "$SANITIZER" = "introspector" ]; then
cd $SRC/inspector

# Correlate fuzzer binaries to fuzz-introspector's raw data
python3 /fuzz-introspector/post-processing/main.py correlate --binaries_dir=$OUT/
python3 /fuzz-introspector/src/main.py correlate --binaries_dir=$OUT/

# Generate fuzz-introspector HTML report, this generates
# the file exe_to_fuzz_introspector_logs.yaml
@@ -236,7 +236,7 @@ if [ "$SANITIZER" = "introspector" ]; then
# Use the just-generated correlation file
REPORT_ARGS="$REPORT_ARGS --correlation_file=exe_to_fuzz_introspector_logs.yaml"
REPORT_ARGS="$REPORT_ARGS --name=$PROJECT_NAME"
python3 /fuzz-introspector/post-processing/main.py report $REPORT_ARGS
python3 /fuzz-introspector/src/main.py report $REPORT_ARGS

cp -rf $SRC/inspector $OUT/inspector
fi
2 changes: 1 addition & 1 deletion infra/base-images/base-clang/Dockerfile
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ RUN apt-get update && apt-get install -y wget sudo && \
RUN apt-get update && apt-get install -y git && \
git clone https://github.com/ossf/fuzz-introspector.git fuzz-introspector && \
cd fuzz-introspector && \
git checkout 051932aa13b07f34e6c4844b084d3d928ae62138 && \
git checkout 10cb2db2c307a211ee0f009bda9fa744880eddba && \
apt-get remove --purge -y git

COPY checkout_build_install_llvm.sh /root/
4 changes: 2 additions & 2 deletions infra/base-images/base-clang/checkout_build_install_llvm.sh
Original file line number Diff line number Diff line change
@@ -107,8 +107,8 @@ if [ -n "$INTROSPECTOR_PATCHES" ]; then
echo "Applying introspector changes"
OLD_WORKING_DIR=$PWD
cd $LLVM_SRC
cp -rf /fuzz-introspector/llvm/include/llvm/Transforms/FuzzIntrospector/ ./llvm/include/llvm/Transforms/FuzzIntrospector
cp -rf /fuzz-introspector/llvm/lib/Transforms/FuzzIntrospector ./llvm/lib/Transforms/FuzzIntrospector
cp -rf /fuzz-introspector/frontends/llvm/include/llvm/Transforms/FuzzIntrospector/ ./llvm/include/llvm/Transforms/FuzzIntrospector
cp -rf /fuzz-introspector/frontends/llvm/lib/Transforms/FuzzIntrospector ./llvm/lib/Transforms/FuzzIntrospector

# LLVM currently does not support dynamically loading LTO passes. Thus,
# we hardcode it into Clang instead.

0 comments on commit 5d4c474

Please sign in to comment.