diff options
author | jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> | 2019-08-13 16:45:22 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-13 16:45:22 -0700 |
commit | 48f321e93939354788fa7a0e1e41c5843b069ad5 (patch) | |
tree | ac0a02e93913dccceb32903cb1406407a6143228 /projects/spidermonkey-ufi | |
parent | 05a30d2ad59a416a8688a0206f3a0741003174f7 (diff) | |
download | oss-fuzz-48f321e93939354788fa7a0e1e41c5843b069ad5.tar.gz |
Revert "[spidermonkey-ufi] Add spidermonkey-ufi project (#2676)" (#2693)
First build is failing.
This reverts commit 0802984dd81a5638adc7607f92682cb629ec12bd.
Diffstat (limited to 'projects/spidermonkey-ufi')
-rw-r--r-- | projects/spidermonkey-ufi/Dockerfile | 24 | ||||
-rwxr-xr-x | projects/spidermonkey-ufi/build.sh | 59 | ||||
-rw-r--r-- | projects/spidermonkey-ufi/project.yaml | 7 | ||||
-rw-r--r-- | projects/spidermonkey-ufi/target.c | 39 |
4 files changed, 0 insertions, 129 deletions
diff --git a/projects/spidermonkey-ufi/Dockerfile b/projects/spidermonkey-ufi/Dockerfile deleted file mode 100644 index cea1b273c..000000000 --- a/projects/spidermonkey-ufi/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2019 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ - -FROM gcr.io/oss-fuzz-base/base-builder -MAINTAINER cdiehl@mozilla.com -RUN apt-get update && apt-get install -y --no-install-recommends \ - autoconf2.13 \ - python -RUN git clone --depth=1 https://github.com/mozilla/gecko-dev mozilla-central -WORKDIR mozilla-central/js/src/ -COPY build.sh target.c $SRC/ diff --git a/projects/spidermonkey-ufi/build.sh b/projects/spidermonkey-ufi/build.sh deleted file mode 100755 index 2ed658cb7..000000000 --- a/projects/spidermonkey-ufi/build.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -eu -# Copyright 2019 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ - -# Case-sensitive names of internal Firefox fuzzing targets. Edit to add more. -FUZZ_TARGETS=( - StructuredCloneReader - Wasm -) - -# Install dependencies. Note that bootstrap installs cargo, which must be added -# to PATH via source. In a successive run (for a different sanitizer), the -# cargo installation carries over, but bootstrap fails if cargo is not in PATH. -export SHELL=/bin/bash -[[ -f "$HOME/.cargo/env" ]] && source $HOME/.cargo/env -../../mach bootstrap --no-interactive --application-choice browser -source $HOME/.cargo/env - -autoconf2.13 - -# Update internal libFuzzer. -(cd ../../tools/fuzzing/libfuzzer && ./clone_libfuzzer.sh HEAD) - -mkdir -p build_OPT.OBJ -cd build_OPT.OBJ - -../configure \ - --enable-optimize \ - --disable-shared-js \ - --disable-jemalloc \ - --enable-tests \ - --enable-fuzzing \ - --enable-address-sanitizer - -make "-j$(nproc)" - -cp dist/bin/fuzz-tests $OUT - -# Build a wrapper binary for each target to set environment variables. -for FUZZ_TARGET in ${FUZZ_TARGETS[@]} -do - $CC $CFLAGS -O0 \ - -DFUZZ_TARGET=$FUZZ_TARGET \ - $SRC/target.c -o $OUT/$FUZZ_TARGET -done - diff --git a/projects/spidermonkey-ufi/project.yaml b/projects/spidermonkey-ufi/project.yaml deleted file mode 100644 index 8eb1f0e09..000000000 --- a/projects/spidermonkey-ufi/project.yaml +++ /dev/null @@ -1,7 +0,0 @@ -homepage: 'https://searchfox.org/mozilla-central/source/js/src/fuzz-tests/README' -primary_contact: 'choller@mozilla.com' -fuzzing_engines: - - libfuzzer -sanitizers: - - address - diff --git a/projects/spidermonkey-ufi/target.c b/projects/spidermonkey-ufi/target.c deleted file mode 100644 index 3538d29c9..000000000 --- a/projects/spidermonkey-ufi/target.c +++ /dev/null @@ -1,39 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#define STRINGLIT(S) #S -#define STRINGIFY(S) STRINGLIT(S) - -// Required for oss-fuzz to consider the binary a target. -static const char* magic __attribute__((used)) = "LLVMFuzzerTestOneInput"; - -int main(int argc, char* argv[]) { - setenv("HOME", "/tmp", 0); - setenv("LIBFUZZER", "1", 1); - setenv("FUZZER", STRINGIFY(FUZZ_TARGET), 1); - - char* options = getenv("ASAN_OPTIONS"); - if (options) { - char* ptr; - char* new_options = strdup(options); - - // https://bugzilla.mozilla.org/1477846 - ptr = strstr(new_options, "detect_stack_use_after_return=1"); - if (ptr) ptr[30] = '0'; - - // https://bugzilla.mozilla.org/1477844 - ptr = strstr(new_options, "detect_leaks=1"); - if (ptr) ptr[13] = '0'; - - setenv("ASAN_OPTIONS", new_options, 1); - free(new_options); - } - - int ret = execv("./fuzz-tests", argv); - if (ret) - perror("execv"); - return ret; -} - |