From 7405bdc9ef2791435b93312f832230a39b8ec075 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 14 Apr 2024 06:56:35 +0100 Subject: [PATCH 1/6] Revert "Disable xz projects." This reverts commit 1bb8ea7c85396da60d6cd8e478d5bbfd808fb07d. The malicious test files have been removed from the git repository in upstream commit e93e13c8b3bec925c56e0c0b675d8000a0f7f754. For xz-java, it was clean to begin with. For xz itself, it's now clean in master. I have also fixed the copyright headers in this commit. --- projects/xz-java/Dockerfile | 24 ++++++++++++ projects/xz-java/XZEncoderFuzzer.java | 42 +++++++++++++++++++++ projects/xz-java/build.sh | 53 +++++++++++++++++++++++++++ projects/xz-java/project.yaml | 10 +++++ projects/xz/Dockerfile | 21 +++++++++++ projects/xz/build.sh | 39 ++++++++++++++++++++ projects/xz/project.yaml | 14 +++++++ 7 files changed, 203 insertions(+) create mode 100644 projects/xz-java/Dockerfile create mode 100644 projects/xz-java/XZEncoderFuzzer.java create mode 100644 projects/xz-java/build.sh create mode 100644 projects/xz-java/project.yaml create mode 100644 projects/xz/Dockerfile create mode 100755 projects/xz/build.sh create mode 100644 projects/xz/project.yaml diff --git a/projects/xz-java/Dockerfile b/projects/xz-java/Dockerfile new file mode 100644 index 000000000000..a015e641bc20 --- /dev/null +++ b/projects/xz-java/Dockerfile @@ -0,0 +1,24 @@ +# Copyright 2023 Google LLC +# +# 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-jvm + +RUN apt-get install ant -y +RUN git clone --depth 1 https://github.com/tukaani-project/xz-java $SRC/xz-java + +COPY build.sh $SRC/ +COPY *Fuzzer.java $SRC/ +WORKDIR $SRC/xz-java \ No newline at end of file diff --git a/projects/xz-java/XZEncoderFuzzer.java b/projects/xz-java/XZEncoderFuzzer.java new file mode 100644 index 000000000000..2a68914c6762 --- /dev/null +++ b/projects/xz-java/XZEncoderFuzzer.java @@ -0,0 +1,42 @@ +// Copyright 2024 Google LLC +// +// 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. +// +import com.code_intelligence.jazzer.api.FuzzedDataProvider; +import org.tukaani.xz.LZMA2Options; +import org.tukaani.xz.UnsupportedOptionsException; +import org.tukaani.xz.XZOutputStream; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +public class XZEncoderFuzzer { + public static void fuzzerTestOneInput(FuzzedDataProvider data) { + ByteArrayInputStream in = new ByteArrayInputStream(data.consumeBytes(300)); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + LZMA2Options options = new LZMA2Options(); + try { + options.setPreset(data.consumeInt(LZMA2Options.PRESET_MIN, LZMA2Options.PRESET_MAX)); + } catch (UnsupportedOptionsException e) { + throw new RuntimeException(e); + } + + byte[] buf = data.consumeBytes(300); + try { + XZOutputStream xzOut = new XZOutputStream(out, options); + xzOut.write(buf, 0, buf.length); + xzOut.finish(); + } catch (IOException e) {} + } +} \ No newline at end of file diff --git a/projects/xz-java/build.sh b/projects/xz-java/build.sh new file mode 100644 index 000000000000..a2d39fb10b73 --- /dev/null +++ b/projects/xz-java/build.sh @@ -0,0 +1,53 @@ +#!/bin/bash -eu +# Copyright 2024 Google LLC +# +# 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. +# +################################################################################ + + +ant + +cp "$SRC/xz-java/build/jar/xz.jar" $OUT/ + +ALL_JARS=$(find $OUT/ -name *.jar ! -name jazzer*.jar -printf "%f ") + +# The classpath at build-time includes the project jars in $OUT as well as the +# Jazzer API. +BUILD_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "$OUT/%s:"):$JAZZER_API_PATH + +# All .jar and .class files lie in the same directory as the fuzzer at runtime. +RUNTIME_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "\$this_dir/%s:"):\$this_dir + +for fuzzer in $(find $SRC -name '*Fuzzer.java'); do + fuzzer_basename=$(basename -s .java $fuzzer) + javac -cp $BUILD_CLASSPATH $fuzzer + cp $SRC/*.class $OUT/ + + # Create an execution wrapper that executes Jazzer with the correct arguments. + echo "#!/bin/bash +# LLVMFuzzerTestOneInput for fuzzer detection. +this_dir=\$(dirname \"\$0\") +if [[ \"\$@\" =~ (^| )-runs=[0-9]+($| ) ]]; then + mem_settings='-Xmx1900m:-Xss900k' +else + mem_settings='-Xmx2048m:-Xss1024k' +fi +LD_LIBRARY_PATH=\"$JVM_LD_LIBRARY_PATH\":\$this_dir \ +\$this_dir/jazzer_driver --agent_path=\$this_dir/jazzer_agent_deploy.jar \ +--cp=$RUNTIME_CLASSPATH \ +--target_class=$fuzzer_basename \ +--jvm_args=\"\$mem_settings\" \ +\$@" > $OUT/$fuzzer_basename + chmod u+x $OUT/$fuzzer_basename +done \ No newline at end of file diff --git a/projects/xz-java/project.yaml b/projects/xz-java/project.yaml new file mode 100644 index 000000000000..fec483032c07 --- /dev/null +++ b/projects/xz-java/project.yaml @@ -0,0 +1,10 @@ +homepage: "https://xz.tukaani.org/xz-for-java/" +language: jvm +primary_contact: "lasse.collin@tukaani.org" +fuzzing_engines: + - libfuzzer +main_repo: "https://github.com/tukaani-project/xz-java" +sanitizers: + - address +vendor_ccs: + - "bug-disclosure@code-intelligence.com" diff --git a/projects/xz/Dockerfile b/projects/xz/Dockerfile new file mode 100644 index 000000000000..9d19d8334055 --- /dev/null +++ b/projects/xz/Dockerfile @@ -0,0 +1,21 @@ +# Copyright 2018 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 +RUN apt-get update && apt-get install -y make autoconf autopoint libtool zip +RUN git clone https://github.com/tukaani-project/xz.git +COPY build.sh $SRC/ +WORKDIR xz diff --git a/projects/xz/build.sh b/projects/xz/build.sh new file mode 100755 index 000000000000..437bf3f46e02 --- /dev/null +++ b/projects/xz/build.sh @@ -0,0 +1,39 @@ +#!/bin/bash -eu +# Copyright 2024 Google LLC +# +# 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. +# +################################################################################ + +./autogen.sh --no-po4a --no-doxygen +./configure \ + --enable-static \ + --disable-debug \ + --disable-shared \ + --disable-xz \ + --disable-xzdec \ + --disable-lzmadec \ + --disable-lzmainfo \ + --disable-ifunc + +make clean +make -j$(nproc) +make -C tests/ossfuzz + +cp $SRC/xz/tests/ossfuzz/config/*.options $OUT/ +cp $SRC/xz/tests/ossfuzz/config/*.dict $OUT/ + +find $SRC/xz/tests/files -name "*.lzma" \ +-exec zip -ujq $OUT/fuzz_decode_alone_seed_corpus.zip "{}" \; +find $SRC/xz/tests/files -name "*.xz" \ +-exec zip -ujq $OUT/fuzz_decode_stream_seed_corpus.zip "{}" \; diff --git a/projects/xz/project.yaml b/projects/xz/project.yaml new file mode 100644 index 000000000000..e10370cd94ab --- /dev/null +++ b/projects/xz/project.yaml @@ -0,0 +1,14 @@ +homepage: "https://xz.tukaani.org/xz-utils/" +language: c++ +primary_contact: "lasse.collin@tukaani.org" +auto_ccs: + - "bshas3@gmail.com" +fuzzing_engines: + - libfuzzer + - afl + - honggfuzz +sanitizers: + - address + - memory + - undefined +main_repo: 'https://github.com/tukaani-project/xz.git' From 1fd87738b000054bb0efdc631ebcd9e7b0213d98 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 14 Apr 2024 07:14:36 +0100 Subject: [PATCH 2/6] xz: update homepage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per https://tukaani.org/, we have: > The XZ projects were moved to their own website on xz.tukaani.org in January 2024 > and back here in their original location in April 2024. > The xz.tukaani.org links don’t work anymore. --- projects/xz/project.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/xz/project.yaml b/projects/xz/project.yaml index e10370cd94ab..d401ea7b4b79 100644 --- a/projects/xz/project.yaml +++ b/projects/xz/project.yaml @@ -1,4 +1,4 @@ -homepage: "https://xz.tukaani.org/xz-utils/" +homepage: "https://tukaani.org/xz/" language: c++ primary_contact: "lasse.collin@tukaani.org" auto_ccs: From b3f0d967f219005f4acefef57bbf9ff7c1243d48 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 14 Apr 2024 07:39:12 +0100 Subject: [PATCH 3/6] xz: drop --disable-ifunc argument xz has dropped IFUNC support in master, see upstream commits 689ae2427342a2ea1206eb5ca08301baf410e7e0 and 986865ea2f9d1f8dbef4a130926df106b0f6d41a. This reverts commit d2e42b2e489eac6fe6268e381b7db151f4c892c5. --- projects/xz/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/xz/build.sh b/projects/xz/build.sh index 437bf3f46e02..95766e4199f4 100755 --- a/projects/xz/build.sh +++ b/projects/xz/build.sh @@ -23,8 +23,7 @@ --disable-xz \ --disable-xzdec \ --disable-lzmadec \ - --disable-lzmainfo \ - --disable-ifunc + --disable-lzmainfo make clean make -j$(nproc) From d15e579e96e7d48a9f79db7cafba1aba91228b9e Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 14 Apr 2024 07:01:12 +0100 Subject: [PATCH 4/6] xz: add Sam James to CC --- projects/xz/project.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/xz/project.yaml b/projects/xz/project.yaml index d401ea7b4b79..fb06a09a8d03 100644 --- a/projects/xz/project.yaml +++ b/projects/xz/project.yaml @@ -3,6 +3,7 @@ language: c++ primary_contact: "lasse.collin@tukaani.org" auto_ccs: - "bshas3@gmail.com" + - "samjd1024@gmail.com" fuzzing_engines: - libfuzzer - afl From 6f493dc904054980468dbf2e976c8f7dc96655c5 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 14 Apr 2024 21:00:11 +0100 Subject: [PATCH 5/6] xz-java: update homepage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per https://tukaani.org/, we have: > The XZ projects were moved to their own website on xz.tukaani.org in January 2024 > and back here in their original location in April 2024. > The xz.tukaani.org links don’t work anymore. --- projects/xz-java/project.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/xz-java/project.yaml b/projects/xz-java/project.yaml index fec483032c07..72910e6650db 100644 --- a/projects/xz-java/project.yaml +++ b/projects/xz-java/project.yaml @@ -1,4 +1,4 @@ -homepage: "https://xz.tukaani.org/xz-for-java/" +homepage: "https://tukaani.org/xz/java.html" language: jvm primary_contact: "lasse.collin@tukaani.org" fuzzing_engines: From 31c489815174e3596bc870ae0f4bccb8bbe304ed Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 14 Apr 2024 22:10:28 +0100 Subject: [PATCH 6/6] xz-java: add missing EOF newline --- projects/xz-java/Dockerfile | 2 +- projects/xz-java/XZEncoderFuzzer.java | 2 +- projects/xz-java/build.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/xz-java/Dockerfile b/projects/xz-java/Dockerfile index a015e641bc20..eedbb1cb0734 100644 --- a/projects/xz-java/Dockerfile +++ b/projects/xz-java/Dockerfile @@ -21,4 +21,4 @@ RUN git clone --depth 1 https://github.com/tukaani-project/xz-java $SRC/xz-java COPY build.sh $SRC/ COPY *Fuzzer.java $SRC/ -WORKDIR $SRC/xz-java \ No newline at end of file +WORKDIR $SRC/xz-java diff --git a/projects/xz-java/XZEncoderFuzzer.java b/projects/xz-java/XZEncoderFuzzer.java index 2a68914c6762..23bffa1bfba8 100644 --- a/projects/xz-java/XZEncoderFuzzer.java +++ b/projects/xz-java/XZEncoderFuzzer.java @@ -39,4 +39,4 @@ public static void fuzzerTestOneInput(FuzzedDataProvider data) { xzOut.finish(); } catch (IOException e) {} } -} \ No newline at end of file +} diff --git a/projects/xz-java/build.sh b/projects/xz-java/build.sh index a2d39fb10b73..f61e726f351b 100644 --- a/projects/xz-java/build.sh +++ b/projects/xz-java/build.sh @@ -50,4 +50,4 @@ LD_LIBRARY_PATH=\"$JVM_LD_LIBRARY_PATH\":\$this_dir \ --jvm_args=\"\$mem_settings\" \ \$@" > $OUT/$fuzzer_basename chmod u+x $OUT/$fuzzer_basename -done \ No newline at end of file +done