From bf3c391ffa283d2d5b16652fe5511550d9d6ecff Mon Sep 17 00:00:00 2001 From: s1341 Date: Tue, 11 Mar 2025 09:12:43 +0200 Subject: [PATCH] librasan: tiny fixes to make it build (#3065) * librasan: tiny fixes to make it build * librasan: source -> . --- libafl_qemu/librasan/Justfile | 38 ++++++++++++------------ libafl_qemu/librasan/asan/Justfile | 12 ++++---- libafl_qemu/librasan/asan/build.rs | 4 +++ libafl_qemu/librasan/dummy_libc/Justfile | 16 +++++----- libafl_qemu/librasan/fuzz/Justfile | 28 ++++++++--------- libafl_qemu/librasan/gasan/Justfile | 24 +++++++-------- libafl_qemu/librasan/qasan/Justfile | 24 +++++++-------- libafl_qemu/librasan/runner/Justfile | 8 ++--- libafl_qemu/librasan/zasan/Justfile | 24 +++++++-------- 9 files changed, 91 insertions(+), 87 deletions(-) diff --git a/libafl_qemu/librasan/Justfile b/libafl_qemu/librasan/Justfile index 98f39acfe0..d38c12cdba 100644 --- a/libafl_qemu/librasan/Justfile +++ b/libafl_qemu/librasan/Justfile @@ -13,11 +13,11 @@ build: build_asan build_dummy build_fuzz build_gasan build_qasan build_runner bu test: test_asan pretty_rust: - #!/bin/bash + #!/bin/sh MAIN_LLVM_VERSION=$LLVM_VERSION cargo run --manifest-path ../../utils/libafl_fmt/Cargo.toml --release -- -v pretty_toml: - #!/bin/bash + #!/bin/sh taplo fmt pretty: pretty_rust pretty_toml @@ -25,53 +25,53 @@ pretty: pretty_rust pretty_toml fix: fix_asan fix_dummy fix_fuzz fix_gasan fix_qasan fix_runner fix_zasan clippy: - #!/bin/bash + #!/bin/sh cargo clippy doc: - #!/bin/bash + #!/bin/sh cargo doc all: fix pretty build test clippy doc build_arm_dev: - #!/bin/bash + #!/bin/sh ARCH=arm PROFILE=dev just build build_aarch64_dev: - #!/bin/bash + #!/bin/sh ARCH=aarch64 PROFILE=dev just build build_x86_64_dev: - #!/bin/bash + #!/bin/sh ARCH=x86_64 PROFILE=dev just build build_i386_dev: - #!/bin/bash + #!/bin/sh ARCH=i386 PROFILE=dev just build build_ppc_dev: - #!/bin/bash + #!/bin/sh ARCH=ppc PROFILE=dev just build build_arm_release: - #!/bin/bash + #!/bin/sh ARCH=arm PROFILE=release just build build_aarch64_release: - #!/bin/bash + #!/bin/sh ARCH=aarch64 PROFILE=release just build build_x86_64_release: - #!/bin/bash + #!/bin/sh ARCH=x86_64 PROFILE=release just build build_i386_release: - #!/bin/bash + #!/bin/sh ARCH=i386 PROFILE=release just build build_ppc_release: - #!/bin/bash + #!/bin/sh ARCH=ppc PROFILE=release just build build_everything_dev: \ @@ -91,7 +91,7 @@ build_everything_release: \ build_everything: build_everything_dev build_everything_release test_arm: - #!/bin/bash + #!/bin/sh ARCH=arm \ PROFILE=dev \ RUSTLOG=debug \ @@ -99,7 +99,7 @@ test_arm: just test test_aarch64: - #!/bin/bash + #!/bin/sh ARCH=aarch64 \ PROFILE=dev \ RUSTLOG=debug \ @@ -107,7 +107,7 @@ test_aarch64: just test test_x86_64: - #!/bin/bash + #!/bin/sh ARCH=x86_64 \ PROFILE=dev \ RUSTLOG=debug \ @@ -115,7 +115,7 @@ test_x86_64: just test test_i386: - #!/bin/bash + #!/bin/sh ARCH=i386 \ PROFILE=dev \ RUSTLOG=debug \ @@ -123,7 +123,7 @@ test_i386: just test test_ppc: - #!/bin/bash + #!/bin/sh ARCH=ppc \ PROFILE=dev \ RUSTLOG=debug \ diff --git a/libafl_qemu/librasan/asan/Justfile b/libafl_qemu/librasan/asan/Justfile index 158af58cf3..b10ee73fcb 100644 --- a/libafl_qemu/librasan/asan/Justfile +++ b/libafl_qemu/librasan/asan/Justfile @@ -5,8 +5,8 @@ ASAN_SOURCE_DIR := source_directory() [unix] compile_asan: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ build \ @@ -17,8 +17,8 @@ compile_asan: [unix] fix_asan: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ fix \ @@ -30,8 +30,8 @@ fix_asan: [unix] test_asan: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cd {{ ASAN_SOURCE_DIR }} cargo \ +nightly \ diff --git a/libafl_qemu/librasan/asan/build.rs b/libafl_qemu/librasan/asan/build.rs index 589b77c5bc..1064983e2c 100644 --- a/libafl_qemu/librasan/asan/build.rs +++ b/libafl_qemu/librasan/asan/build.rs @@ -9,6 +9,7 @@ fn main() { cc::Build::new() .define("_GNU_SOURCE", None) + .opt_level(3) .flag("-Werror") .flag("-fno-stack-protector") .flag("-ffunction-sections") @@ -18,6 +19,7 @@ fn main() { cc::Build::new() .define("_GNU_SOURCE", None) + .opt_level(3) .flag("-Werror") .flag("-fno-stack-protector") .flag("-ffunction-sections") @@ -27,6 +29,7 @@ fn main() { cc::Build::new() .define("_GNU_SOURCE", None) + .opt_level(3) .flag("-Werror") .flag("-fno-stack-protector") .flag("-ffunction-sections") @@ -36,6 +39,7 @@ fn main() { cc::Build::new() .define("_GNU_SOURCE", None) + .opt_level(3) .flag("-Werror") .flag("-fno-stack-protector") .flag("-ffunction-sections") diff --git a/libafl_qemu/librasan/dummy_libc/Justfile b/libafl_qemu/librasan/dummy_libc/Justfile index 7cdb4379f6..61ec8a9d07 100644 --- a/libafl_qemu/librasan/dummy_libc/Justfile +++ b/libafl_qemu/librasan/dummy_libc/Justfile @@ -5,8 +5,8 @@ DUMMY_SOURCE_DIR := source_directory() [unix] compile_dummy: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ build \ @@ -17,8 +17,8 @@ compile_dummy: [unix] fix_dummy: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ fix \ @@ -31,8 +31,8 @@ fix_dummy: [unix] link_dummy: compile_dummy - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_CC} \ ${LIBRASAN_CFLAGS} \ -shared \ @@ -51,8 +51,8 @@ link_dummy: compile_dummy [unix] strip_dummy: link_dummy - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_STRIP} \ --strip-unneeded \ -o {{ TARGET_DIR }}/$CROSS_TARGET/{{ PROFILE_DIR }}/libdummy_libc.so \ diff --git a/libafl_qemu/librasan/fuzz/Justfile b/libafl_qemu/librasan/fuzz/Justfile index ca5ab02fae..f1acdbac13 100644 --- a/libafl_qemu/librasan/fuzz/Justfile +++ b/libafl_qemu/librasan/fuzz/Justfile @@ -7,8 +7,8 @@ FUZZ_JOBS := if PROFILE == "dev" { "" } else { "-jobs=8" } [unix] build_fuzz: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ build \ @@ -19,8 +19,8 @@ build_fuzz: [unix] fix_fuzz: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ fix \ @@ -32,8 +32,8 @@ fix_fuzz: [unix] run_fuzz: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ fuzz \ @@ -48,24 +48,24 @@ run_fuzz: [unix] fuzz_guest_shadow: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} HARNESS=guest_shadow just run_fuzz [unix] fuzz_guest_tracking: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} HARNESS=guest_tracking just run_fuzz [unix] fuzz_default_frontend_mock: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} HARNESS=default_frontend_mock just run_fuzz [unix] fuzz_default_frontend_dlmalloc: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} HARNESS=default_frontend_dlmalloc just run_fuzz diff --git a/libafl_qemu/librasan/gasan/Justfile b/libafl_qemu/librasan/gasan/Justfile index 9eff698935..056308b83e 100644 --- a/libafl_qemu/librasan/gasan/Justfile +++ b/libafl_qemu/librasan/gasan/Justfile @@ -6,8 +6,8 @@ GASAN_SOURCE_DIR := source_directory() [unix] compile_gasan: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ build \ @@ -18,8 +18,8 @@ compile_gasan: [unix] fix_gasan: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ fix \ @@ -32,8 +32,8 @@ fix_gasan: [unix] rel_gasan: compile_gasan build_dummy - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_CC} \ ${LIBRASAN_CFLAGS} \ -r \ @@ -65,8 +65,8 @@ rel_gasan: compile_gasan build_dummy [unix] rename_gasan: rel_gasan - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_OBJCOPY} \ --redefine-syms={{ GASAN_SOURCE_DIR }}/rename_real.syms \ --redefine-syms={{ GASAN_SOURCE_DIR }}/rename_patch.syms \ @@ -75,8 +75,8 @@ rename_gasan: rel_gasan [unix] link_gasan: rename_gasan - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_CC} \ -shared \ -nodefaultlibs \ @@ -111,8 +111,8 @@ link_gasan: rename_gasan "-ldummy_libc" \ strip_gasan: link_gasan - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_STRIP} \ --strip-unneeded \ -o {{ TARGET_DIR }}/$CROSS_TARGET/{{ PROFILE_DIR }}/libgasan.so \ diff --git a/libafl_qemu/librasan/qasan/Justfile b/libafl_qemu/librasan/qasan/Justfile index eaf72aacf4..48f3cf0fa4 100644 --- a/libafl_qemu/librasan/qasan/Justfile +++ b/libafl_qemu/librasan/qasan/Justfile @@ -6,8 +6,8 @@ QASAN_SOURCE_DIR := source_directory() [unix] compile_qasan: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ build \ @@ -18,8 +18,8 @@ compile_qasan: [unix] fix_qasan: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ fix \ @@ -32,8 +32,8 @@ fix_qasan: [unix] rel_qasan: compile_qasan build_dummy - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_CC} \ ${LIBRASAN_CFLAGS} \ -r \ @@ -65,8 +65,8 @@ rel_qasan: compile_qasan build_dummy [unix] rename_qasan: rel_qasan - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_OBJCOPY} \ --redefine-syms={{ GASAN_SOURCE_DIR }}/rename_real.syms \ --redefine-syms={{ GASAN_SOURCE_DIR }}/rename_patch.syms \ @@ -75,8 +75,8 @@ rename_qasan: rel_qasan [unix] link_qasan: rename_qasan - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_CC} \ -shared \ -nodefaultlibs \ @@ -112,8 +112,8 @@ link_qasan: rename_qasan [unix] strip_qasan: link_qasan - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_STRIP} \ --strip-unneeded \ -o {{ TARGET_DIR }}/$CROSS_TARGET/{{ PROFILE_DIR }}/libqasan.so \ diff --git a/libafl_qemu/librasan/runner/Justfile b/libafl_qemu/librasan/runner/Justfile index 31fbfa1a5a..ad96c44add 100644 --- a/libafl_qemu/librasan/runner/Justfile +++ b/libafl_qemu/librasan/runner/Justfile @@ -3,8 +3,8 @@ import "../fuzzer_name.just" [unix] compile_runner: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ build \ @@ -16,8 +16,8 @@ compile_runner: [unix] fix_runner: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ fix \ diff --git a/libafl_qemu/librasan/zasan/Justfile b/libafl_qemu/librasan/zasan/Justfile index 8edb6375b5..5d0d7e1c46 100644 --- a/libafl_qemu/librasan/zasan/Justfile +++ b/libafl_qemu/librasan/zasan/Justfile @@ -5,8 +5,8 @@ ZASAN_SOURCE_DIR := source_directory() [unix] compile_zasan: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} RUSTFLAGS="--cfg rustix_use_experimental_asm" \ cargo \ +nightly \ @@ -18,8 +18,8 @@ compile_zasan: [unix] fix_zasan: - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} cargo \ +nightly \ fix \ @@ -32,8 +32,8 @@ fix_zasan: [unix] rel_zasan: compile_zasan build_dummy - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_CC} \ ${LIBRASAN_CFLAGS} \ -r \ @@ -65,8 +65,8 @@ rel_zasan: compile_zasan build_dummy [unix] rename_zasan: rel_zasan - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_OBJCOPY} \ --redefine-syms={{ GASAN_SOURCE_DIR }}/rename_real.syms \ --redefine-syms={{ GASAN_SOURCE_DIR }}/rename_patch.syms \ @@ -75,8 +75,8 @@ rename_zasan: rel_zasan [unix] link_zasan: rename_zasan - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_CC} \ -shared \ -nodefaultlibs \ @@ -110,8 +110,8 @@ link_zasan: rename_zasan [unix] strip_zasan: link_zasan - #!/bin/bash - source {{ DOTENV }} + #!/bin/sh + . {{ DOTENV }} ${CROSS_STRIP} \ --strip-unneeded \ -o {{ TARGET_DIR }}/$CROSS_TARGET/{{ PROFILE_DIR }}/libzasan.so \