From 632f604ede1a996f0a4a24294e65e8e87d6d81fd Mon Sep 17 00:00:00 2001 From: Navidem Date: Wed, 16 Mar 2022 16:02:52 -0700 Subject: Add two new fuzz targets (#7386) * Add two new fuzz targets * Add copyright --- projects/jsonnet/build.sh | 15 +++--- projects/jsonnet/convert_jsonnet_fuzzer.cc | 42 ---------------- projects/jsonnet/convert_jsonnet_fuzzer_multi.cc | 57 ++++++++++++++++++++++ projects/jsonnet/convert_jsonnet_fuzzer_regular.cc | 57 ++++++++++++++++++++++ projects/jsonnet/convert_jsonnet_fuzzer_stream.cc | 57 ++++++++++++++++++++++ 5 files changed, 180 insertions(+), 48 deletions(-) delete mode 100644 projects/jsonnet/convert_jsonnet_fuzzer.cc create mode 100644 projects/jsonnet/convert_jsonnet_fuzzer_multi.cc create mode 100644 projects/jsonnet/convert_jsonnet_fuzzer_regular.cc create mode 100644 projects/jsonnet/convert_jsonnet_fuzzer_stream.cc diff --git a/projects/jsonnet/build.sh b/projects/jsonnet/build.sh index 1b0ceed4..a1d164d9 100644 --- a/projects/jsonnet/build.sh +++ b/projects/jsonnet/build.sh @@ -24,9 +24,12 @@ popd INSTALL_DIR="$SRC/jsonnet" -fuzzer=convert_jsonnet_fuzzer -$CXX $CXXFLAGS -I${INSTALL_DIR}/include $LIB_FUZZING_ENGINE \ - $fuzzer.cc -o $OUT/$fuzzer \ - ${INSTALL_DIR}/build/libjsonnet.a \ - ${INSTALL_DIR}/build/libmd5.a \ - ${INSTALL_DIR}/build/libryml.a +for fuzzer in convert_jsonnet_fuzzer_regular \ + convert_jsonnet_fuzzer_stream \ + convert_jsonnet_fuzzer_multi; do + $CXX $CXXFLAGS -I${INSTALL_DIR}/include $LIB_FUZZING_ENGINE \ + $fuzzer.cc -o $OUT/$fuzzer \ + ${INSTALL_DIR}/build/libjsonnet.a \ + ${INSTALL_DIR}/build/libmd5.a \ + ${INSTALL_DIR}/build/libryml.a +done diff --git a/projects/jsonnet/convert_jsonnet_fuzzer.cc b/projects/jsonnet/convert_jsonnet_fuzzer.cc deleted file mode 100644 index 553095a1..00000000 --- a/projects/jsonnet/convert_jsonnet_fuzzer.cc +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include -#include -#include - -extern "C" { -#include "libjsonnet.h" -} - -char* ImportCallback(void* ctx, const char* base, const char* rel, - char** found_here, int* success) { - // Don't load file and mark it as failure. - *success = 0; - char* res = jsonnet_realloc(static_cast(ctx), nullptr, 1); - res[0] = 0; - return res; -} - -std::string ConvertJsonnetToJson(const std::string& jsonnet) { - JsonnetVm* jvm = jsonnet_make(); - jsonnet_import_callback(jvm, ImportCallback, jvm); - int error = 0; - char* res = - jsonnet_evaluate_snippet(jvm, /*filename=*/"", jsonnet.c_str(), &error); - - std::string json; - if (error == 0 && res != nullptr) { - json = res; - } - - if (res) { - jsonnet_realloc(jvm, res, 0); - } - jsonnet_destroy(jvm); - return json; -} - -extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { - std::string fuzz_jsonnet(reinterpret_cast(data), size); - ConvertJsonnetToJson(fuzz_jsonnet); - return 0; -} diff --git a/projects/jsonnet/convert_jsonnet_fuzzer_multi.cc b/projects/jsonnet/convert_jsonnet_fuzzer_multi.cc new file mode 100644 index 00000000..3f824799 --- /dev/null +++ b/projects/jsonnet/convert_jsonnet_fuzzer_multi.cc @@ -0,0 +1,57 @@ +// Copyright 2022 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 +#include +#include +#include + +extern "C" { +#include "libjsonnet.h" +} + +char* ImportCallback(void* ctx, const char* base, const char* rel, + char** found_here, int* success) { + // Don't load file and mark it as failure. + *success = 0; + char* res = jsonnet_realloc(static_cast(ctx), nullptr, 1); + res[0] = 0; + return res; +} + +std::string ConvertJsonnetToJson(const std::string& jsonnet) { + JsonnetVm* jvm = jsonnet_make(); + jsonnet_import_callback(jvm, ImportCallback, jvm); + int error = 0; + char* res = + jsonnet_evaluate_snippet_multi(jvm, /*filename=*/"", jsonnet.c_str(), &error); + + std::string json; + if (error == 0 && res != nullptr) { + json = res; + } + + if (res) { + jsonnet_realloc(jvm, res, 0); + } + jsonnet_destroy(jvm); + return json; +} + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + std::string fuzz_jsonnet(reinterpret_cast(data), size); + ConvertJsonnetToJson(fuzz_jsonnet); + return 0; +} diff --git a/projects/jsonnet/convert_jsonnet_fuzzer_regular.cc b/projects/jsonnet/convert_jsonnet_fuzzer_regular.cc new file mode 100644 index 00000000..034b9ed3 --- /dev/null +++ b/projects/jsonnet/convert_jsonnet_fuzzer_regular.cc @@ -0,0 +1,57 @@ +// Copyright 2022 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 +#include +#include +#include + +extern "C" { +#include "libjsonnet.h" +} + +char* ImportCallback(void* ctx, const char* base, const char* rel, + char** found_here, int* success) { + // Don't load file and mark it as failure. + *success = 0; + char* res = jsonnet_realloc(static_cast(ctx), nullptr, 1); + res[0] = 0; + return res; +} + +std::string ConvertJsonnetToJson(const std::string& jsonnet) { + JsonnetVm* jvm = jsonnet_make(); + jsonnet_import_callback(jvm, ImportCallback, jvm); + int error = 0; + char* res = + jsonnet_evaluate_snippet(jvm, /*filename=*/"", jsonnet.c_str(), &error); + + std::string json; + if (error == 0 && res != nullptr) { + json = res; + } + + if (res) { + jsonnet_realloc(jvm, res, 0); + } + jsonnet_destroy(jvm); + return json; +} + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + std::string fuzz_jsonnet(reinterpret_cast(data), size); + ConvertJsonnetToJson(fuzz_jsonnet); + return 0; +} diff --git a/projects/jsonnet/convert_jsonnet_fuzzer_stream.cc b/projects/jsonnet/convert_jsonnet_fuzzer_stream.cc new file mode 100644 index 00000000..8eb107a1 --- /dev/null +++ b/projects/jsonnet/convert_jsonnet_fuzzer_stream.cc @@ -0,0 +1,57 @@ +// Copyright 2022 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 +#include +#include +#include + +extern "C" { +#include "libjsonnet.h" +} + +char* ImportCallback(void* ctx, const char* base, const char* rel, + char** found_here, int* success) { + // Don't load file and mark it as failure. + *success = 0; + char* res = jsonnet_realloc(static_cast(ctx), nullptr, 1); + res[0] = 0; + return res; +} + +std::string ConvertJsonnetToJson(const std::string& jsonnet) { + JsonnetVm* jvm = jsonnet_make(); + jsonnet_import_callback(jvm, ImportCallback, jvm); + int error = 0; + char* res = + jsonnet_evaluate_snippet_stream(jvm, /*filename=*/"", jsonnet.c_str(), &error); + + std::string json; + if (error == 0 && res != nullptr) { + json = res; + } + + if (res) { + jsonnet_realloc(jvm, res, 0); + } + jsonnet_destroy(jvm); + return json; +} + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + std::string fuzz_jsonnet(reinterpret_cast(data), size); + ConvertJsonnetToJson(fuzz_jsonnet); + return 0; +} -- cgit v1.2.3