diff --git a/projects/util-linux/Dockerfile b/projects/util-linux/Dockerfile index e0abf9d56..16ea63d42 100644 --- a/projects/util-linux/Dockerfile +++ b/projects/util-linux/Dockerfile @@ -19,4 +19,3 @@ RUN apt-get update && apt-get install -y autoconf automake autopoint bison libto RUN git clone --depth 1 https://github.com/karelzak/util-linux WORKDIR util-linux COPY build.sh $SRC/ -COPY test_mount_fuzz.c $SRC/ diff --git a/projects/util-linux/build.sh b/projects/util-linux/build.sh index 203376e1b..3c4195cd0 100755 --- a/projects/util-linux/build.sh +++ b/projects/util-linux/build.sh @@ -15,14 +15,4 @@ # ################################################################################ -set -x - -if [[ -f "tools/oss-fuzz.sh" ]]; then - ./tools/oss-fuzz.sh -else - ./autogen.sh - ./configure --disable-all-programs --enable-libmount --enable-libblkid - make -j$(nproc) V=1 libmount.la libblkid.la - $CC $CFLAGS -Wall -Wextra -include config.h -I./include -I./libblkid/src -I./libmount/src -c $SRC/test_mount_fuzz.c -o test_mount_fuzz.o - $CXX $CXXFLAGS $LIB_FUZZING_ENGINE test_mount_fuzz.o ./.libs/libblkid.a ./.libs/libmount.a .libs/libblkid.a -o $OUT/test_mount_fuzz -fi +./tools/oss-fuzz.sh diff --git a/projects/util-linux/test_mount_fuzz.c b/projects/util-linux/test_mount_fuzz.c deleted file mode 100644 index 9d046a9e3..000000000 --- a/projects/util-linux/test_mount_fuzz.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 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. -*/ - -#include "mountP.h" - -#include -#include - -int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - struct libmnt_table *tb = NULL; - FILE *f = NULL; - - if (size == 0) - return 0; - - tb = mnt_new_table(); - assert(tb); - - f = fmemopen((char*) data, size, "re"); - assert(f); - - (void) mnt_table_parse_stream(tb, f, "mountinfo"); - - mnt_unref_table(tb); - fclose(f); - - return 0; -}