Merge pull request #253 from Gottox/improve/inode-map-deadlock

inode_map: fix deadlock when the inode map encounters inconsistencies
Gottox · Jun 2, 2024 · 9755f40 · 9755f40
2 parents eb777b2 + c0a590d
commit 9755f40
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/libsqsh/src/archive/inode_map.c b/libsqsh/src/archive/inode_map.c
@@ -192,15 +192,14 @@ dyn_map_set(
 		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_ERROR_INODE_MAP_IS_INCONSISTENT;
+			goto out;
 		}
 	}
 
-	rv = sqsh__mutex_unlock(map->mutex);
-	if (rv < 0) {
-		return rv;
-	}
-	return 0;
+out:
+	sqsh__mutex_unlock(map->mutex);
+	return rv;
 }
 
 static int

diff --git a/test/fuzzer/meson.build b/test/fuzzer/meson.build
@@ -22,6 +22,7 @@ fuzzer_repro = files(
     'crash_e770c992b26a129aaeea42993b2a9b06ba91faca',
     'crash_f7bc33d88bbc6a270c32bc6969059a0c44c49dd4',
     'leak_2f97e04d5e7167856ba0827c10939690d203cb54',
+    'timeout-ed751e8e6821ce6ef7947a1133b8845f27e28ebd',
 )
 
 utest_dep = dependency('utest')

diff --git a/test/fuzzer/timeout-ed751e8e6821ce6ef7947a1133b8845f27e28ebd b/test/fuzzer/timeout-ed751e8e6821ce6ef7947a1133b8845f27e28ebd