Gottox · Gottox · Jun 2, 2024 · Jun 2, 2024 · Jun 2, 2024 · Jun 2, 2024
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -84,6 +84,8 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: gottox/sqsh-build:x86_64
+      volumes:
+      - /tmp/build:/tmp/build
     steps:
     - uses: actions/checkout@v4
     - name: configure
@@ -103,6 +105,12 @@ jobs:
     - name: fuzzer
       run: |
          ninja -C /tmp/build test
+    - name: Upload Failing Inputs
+      uses: actions/upload-artifact@v4
+      if: failure()
+      with:
+        name: failing-inputs
+        path: /tmp/build/fuzzer/inputs
 
   build:
     needs:

diff --git a/fuzzer/inputs/extract.fuzz_crash_1 b/fuzzer/inputs/extract.fuzz_crash_1
diff --git a/fuzzer/inputs/extract.fuzz_crash_10 b/fuzzer/inputs/extract.fuzz_crash_10
diff --git a/fuzzer/inputs/extract.fuzz_crash_11 b/fuzzer/inputs/extract.fuzz_crash_11
diff --git a/fuzzer/inputs/extract.fuzz_crash_12 b/fuzzer/inputs/extract.fuzz_crash_12
diff --git a/fuzzer/inputs/extract.fuzz_crash_13 b/fuzzer/inputs/extract.fuzz_crash_13
diff --git a/fuzzer/inputs/extract.fuzz_crash_14 b/fuzzer/inputs/extract.fuzz_crash_14
diff --git a/fuzzer/inputs/extract.fuzz_crash_15 b/fuzzer/inputs/extract.fuzz_crash_15
diff --git a/fuzzer/inputs/extract.fuzz_crash_16 b/fuzzer/inputs/extract.fuzz_crash_16
diff --git a/fuzzer/inputs/extract.fuzz_crash_17 b/fuzzer/inputs/extract.fuzz_crash_17
diff --git a/fuzzer/inputs/extract.fuzz_crash_18 b/fuzzer/inputs/extract.fuzz_crash_18
diff --git a/fuzzer/inputs/extract.fuzz_crash_19 b/fuzzer/inputs/extract.fuzz_crash_19
diff --git a/fuzzer/inputs/extract.fuzz_crash_2 b/fuzzer/inputs/extract.fuzz_crash_2
diff --git a/fuzzer/inputs/extract.fuzz_crash_20 b/fuzzer/inputs/extract.fuzz_crash_20
diff --git a/fuzzer/inputs/extract.fuzz_crash_21 b/fuzzer/inputs/extract.fuzz_crash_21
diff --git a/fuzzer/inputs/extract.fuzz_crash_3 b/fuzzer/inputs/extract.fuzz_crash_3
diff --git a/fuzzer/inputs/extract.fuzz_crash_4 b/fuzzer/inputs/extract.fuzz_crash_4
diff --git a/fuzzer/inputs/extract.fuzz_crash_5 b/fuzzer/inputs/extract.fuzz_crash_5
diff --git a/fuzzer/inputs/extract.fuzz_crash_6 b/fuzzer/inputs/extract.fuzz_crash_6
diff --git a/fuzzer/inputs/extract.fuzz_crash_7 b/fuzzer/inputs/extract.fuzz_crash_7
diff --git a/fuzzer/inputs/extract.fuzz_crash_8 b/fuzzer/inputs/extract.fuzz_crash_8
diff --git a/fuzzer/inputs/extract.fuzz_crash_9 b/fuzzer/inputs/extract.fuzz_crash_9
diff --git a/fuzzer/inputs/extract.fuzz_leak_1 b/fuzzer/inputs/extract.fuzz_leak_1
diff --git a/fuzzer/inputs/extract.fuzz_oom_1 b/fuzzer/inputs/extract.fuzz_oom_1
diff --git a/fuzzer/meson.build b/fuzzer/meson.build
@@ -31,17 +31,26 @@ fuzzer = executable(
     link_with: libsqsh.get_static_lib(),
 )
 
+rundir_tgt = custom_target(
+    'fuzzer_inputs',
+    output: 'inputs',
+    command: [mkdir, '-p', '@OUTPUT@'],
+)
+
 test(
     'simple_fuzzer',
     fuzzer,
-    depends: corpus_tgt,
+    workdir: rundir_tgt.full_path(),
+    is_parallel: false,
+    depends: [corpus_tgt, rundir_tgt],
     args: [
         corpus_tgt.full_path(),
         source_corpus,
         '-error_exitcode=1',
         '-timeout_exitcode=1',
-        '-timeout=3',
+        '-timeout=10',
         '-rss_limit_mb=0',
+        '-malloc_limit_mb=10',
         '-max_total_time=@0@'.format(get_option('fuzzer_timeout')),
     ],
     timeout: 10 + get_option('fuzzer_timeout'),

diff --git a/libsqsh/include/sqsh_archive_private.h b/libsqsh/include/sqsh_archive_private.h
@@ -110,7 +110,7 @@ struct SqshInodeMap {
 	 */
 	const struct SqshInodeMapImpl *impl;
 	sqsh__mutex_t *mutex;
-	uint_fast64_t *inode_refs;
+	struct CxRadixTree inode_refs;
 	size_t inode_count;
 	struct SqshExportTable *export_table;
 };

diff --git a/libsqsh/src/archive/inode_map.c b/libsqsh/src/archive/inode_map.c
@@ -113,11 +113,8 @@ dyn_map_init(struct SqshInodeMap *map, struct SqshArchive *archive) {
 	}
 	pthread_mutex_init(map->mutex, NULL);
 	map->export_table = NULL;
-	map->inode_refs = calloc(inode_count, sizeof(uint_fast64_t));
-	if (map->inode_refs == NULL) {
-		rv = -SQSH_ERROR_MALLOC_FAILED;
-		goto out;
-	}
+
+	cx_radix_tree_init(&map->inode_refs, sizeof(uint64_t[256]));
 out:
 	return rv;
 }
@@ -127,7 +124,6 @@ static uint64_t
 dyn_map_get(const struct SqshInodeMap *map, uint32_t inode_number, int *err) {
 	int rv = 0;
 	uint64_t inode_ref = 0;
-	uint_fast64_t *inode_refs = map->inode_refs;
 
 	if (inode_number == 0 || inode_number - 1 >= map->inode_count) {
 		rv = -SQSH_ERROR_OUT_OF_BOUNDS;
@@ -137,7 +133,18 @@ dyn_map_get(const struct SqshInodeMap *map, uint32_t inode_number, int *err) {
 	if (rv < 0) {
 		goto out;
 	}
-	inode_ref = ~inode_refs[inode_number - 1];
+
+	sqsh_index_t index = inode_number - 1;
+	sqsh_index_t inner_index = index & 0xff;
+	sqsh_index_t outer_index = index >> 8;
+
+	uint_fast64_t *inner_inode_refs =
+			cx_radix_tree_get(&map->inode_refs, outer_index);
+	if (inner_inode_refs == NULL) {
+		rv = -SQSH_ERROR_NO_SUCH_ELEMENT;
+		goto out;
+	}
+	inode_ref = ~inner_inode_refs[inner_index];
 	if (inode_ref == EMPTY_INODE_REF) {
 		rv = -SQSH_ERROR_NO_SUCH_ELEMENT;
 		inode_ref = 0;
@@ -159,8 +166,6 @@ static int
 dyn_map_set(
 		struct SqshInodeMap *map, uint32_t inode_number, uint64_t inode_ref) {
 	int rv = 0;
-	uint64_t old_value;
-	uint_fast64_t *inode_refs = map->inode_refs;
 
 	if (inode_ref == EMPTY_INODE_REF) {
 		return -SQSH_ERROR_INVALID_ARGUMENT;
@@ -172,11 +177,25 @@ dyn_map_set(
 	if (rv < 0) {
 		return rv;
 	}
-	old_value = ~inode_refs[inode_number - 1];
-	inode_refs[inode_number - 1] = ~inode_ref;
-	if (old_value != EMPTY_INODE_REF && old_value != inode_ref) {
-		return -SQSH_ERROR_INODE_MAP_IS_INCONSISTENT;
+
+	sqsh_index_t index = inode_number - 1;
+	sqsh_index_t inner_index = index & 0xff;
+	sqsh_index_t outer_index = index >> 8;
+
+	uint_fast64_t *inner_inode_refs =
+			cx_radix_tree_get(&map->inode_refs, outer_index);
+	if (inner_inode_refs == NULL) {
+		uint64_t new_inner_inode_refs[256] = {0};
+		new_inner_inode_refs[inner_index] = ~inode_ref;
+		cx_radix_tree_put(&map->inode_refs, outer_index, new_inner_inode_refs);
+	} else {
+		const uint64_t old_value = ~inner_inode_refs[inner_index];
+		inner_inode_refs[inner_index] = ~inode_ref;
+		if (old_value != EMPTY_INODE_REF && old_value != inode_ref) {
+			return -SQSH_ERROR_INODE_MAP_IS_INCONSISTENT;
+		}
 	}
+
 	rv = sqsh__mutex_unlock(map->mutex);
 	if (rv < 0) {
 		return rv;
@@ -192,7 +211,7 @@ export_table_cleanup(struct SqshInodeMap *map) {
 
 static int
 dyn_map_cleanup(struct SqshInodeMap *map) {
-	free(map->inode_refs);
+	cx_radix_tree_cleanup(&map->inode_refs);
 	pthread_mutex_destroy(map->mutex);
 	free(map->mutex);
 	return 0;

diff --git a/subprojects/cextras.wrap b/subprojects/cextras.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 directory = cextras
-revision = 44e59a4d70efdafed930329241b711d2be302cd5
+revision = 908ea12a9cdbd1e52ddc45519fc19dc3743a893a
 url = https://github.com/Gottox/cextras.git
 depth = 1
 

diff --git a/test/fuzzer/fuzz_crash_1 b/test/fuzzer/fuzz_crash_1
diff --git a/test/fuzzer/fuzz_crash_10 b/test/fuzzer/fuzz_crash_10
diff --git a/test/fuzzer/fuzz_crash_11 b/test/fuzzer/fuzz_crash_11
diff --git a/test/fuzzer/fuzz_crash_12 b/test/fuzzer/fuzz_crash_12
diff --git a/test/fuzzer/fuzz_crash_13 b/test/fuzzer/fuzz_crash_13
diff --git a/test/fuzzer/fuzz_crash_14 b/test/fuzzer/fuzz_crash_14
diff --git a/test/fuzzer/fuzz_crash_15 b/test/fuzzer/fuzz_crash_15
diff --git a/test/fuzzer/fuzz_crash_16 b/test/fuzzer/fuzz_crash_16
diff --git a/test/fuzzer/fuzz_crash_17 b/test/fuzzer/fuzz_crash_17
diff --git a/test/fuzzer/fuzz_crash_18 b/test/fuzzer/fuzz_crash_18
diff --git a/test/fuzzer/fuzz_crash_19 b/test/fuzzer/fuzz_crash_19
diff --git a/test/fuzzer/fuzz_crash_2 b/test/fuzzer/fuzz_crash_2
diff --git a/test/fuzzer/fuzz_crash_20 b/test/fuzzer/fuzz_crash_20
diff --git a/test/fuzzer/fuzz_crash_21 b/test/fuzzer/fuzz_crash_21
diff --git a/test/fuzzer/fuzz_crash_22 b/test/fuzzer/fuzz_crash_22
diff --git a/test/fuzzer/fuzz_crash_3 b/test/fuzzer/fuzz_crash_3
diff --git a/test/fuzzer/fuzz_crash_4 b/test/fuzzer/fuzz_crash_4
diff --git a/test/fuzzer/fuzz_crash_5 b/test/fuzzer/fuzz_crash_5
diff --git a/test/fuzzer/fuzz_crash_6 b/test/fuzzer/fuzz_crash_6
diff --git a/test/fuzzer/fuzz_crash_7 b/test/fuzzer/fuzz_crash_7
diff --git a/test/fuzzer/fuzz_crash_8 b/test/fuzzer/fuzz_crash_8
diff --git a/test/fuzzer/fuzz_crash_9 b/test/fuzzer/fuzz_crash_9
diff --git a/test/fuzzer/fuzz_leak_1 b/test/fuzzer/fuzz_leak_1
diff --git a/test/fuzzer/meson.build b/test/fuzzer/meson.build
@@ -0,0 +1,59 @@
+fuzzer_repro = files(
+    'fuzz_crash_1',
+    'fuzz_crash_10',
+    'fuzz_crash_11',
+    'fuzz_crash_12',
+    'fuzz_crash_13',
+    'fuzz_crash_14',
+    'fuzz_crash_15',
+    'fuzz_crash_16',
+    'fuzz_crash_17',
+    'fuzz_crash_18',
+    'fuzz_crash_19',
+    'fuzz_crash_2',
+    'fuzz_crash_20',
+    'fuzz_crash_21',
+    'fuzz_crash_22',
+    'fuzz_crash_3',
+    'fuzz_crash_4',
+    'fuzz_crash_5',
+    'fuzz_crash_6',
+    'fuzz_crash_7',
+    'fuzz_crash_8',
+    'fuzz_crash_9',
+    'fuzz_leak_1',
+)
+
+utest_dep = dependency('utest')
+
+fuzzer_repro_codegen = executable('repro_codegen', 'repro_codegen.c')
+
+fuzzer_repro_tgt = custom_target(
+    'repro_test',
+    output: 'repro_test.c',
+    capture: true,
+    input: fuzzer_repro,
+    command: [
+        fuzzer_repro_codegen,
+        '@INPUT@',
+    ],
+)
+
+fuzzer_src = files(
+    '../../fuzzer/simple.c',
+)
+fuzzer_repro_test = executable(
+    'repro_test',
+    [fuzzer_repro_tgt, fuzzer_src],
+    include_directories: [
+        libsqsh_include,
+        libsqsh_common_include,
+        libsqsh_private_include,
+        libmksqsh_include,
+    ],
+    link_with: [libsqsh.get_static_lib(), libmksqsh.get_static_lib()],
+    dependencies: [threads_dep, utest_dep, cextras_dep],
+
+)
+
+test('simple_fuzzer_repro', fuzzer_repro_test)
diff --git a/test/fuzzer/repro_codegen.c b/test/fuzzer/repro_codegen.c
@@ -0,0 +1,41 @@
+#include <assert.h>
+#include <libgen.h>
+#include <stdio.h>
+
+#define HEADER \
+	"#include <sqsh.h>\n" \
+	"#include <utest.h>\n" \
+	"int LLVMFuzzerTestOneInput(char *data, size_t size);"
+
+#define TEST_PRE_FORMAT \
+	"UTEST(fuzzer_repro, %s) {\n" \
+	"	(void)utest_result;\n" \
+	"	unsigned char input[] = {\n"
+
+#define TEST_POST \
+	"\n" \
+	"		};\n" \
+	"	LLVMFuzzerTestOneInput((char *)input, sizeof(input));\n" \
+	"}\n"
+
+#define FOOTER "UTEST_MAIN()"
+
+int
+main(int argc, char *argv[]) {
+	puts("#include <utest.h>\n"
+		 "");
+	puts(HEADER);
+	for (int i = 1; i < argc; i++) {
+		printf(TEST_PRE_FORMAT, basename(argv[i]));
+		FILE *f = fopen(argv[i], "rb");
+		assert(f);
+		int c;
+		while ((c = fgetc(f)) != EOF) {
+			printf("0x%02x, ", c);
+		}
+		fclose(f);
+		puts(TEST_POST);
+	}
+	puts(FOOTER);
+	return 0;
+}