diff --git a/tools/testing/selftests/filesystems/incfs/Makefile b/tools/testing/selftests/filesystems/incfs/Makefile
index f3798029247a..5a2f6301c4b2 100644
--- a/tools/testing/selftests/filesystems/incfs/Makefile
+++ b/tools/testing/selftests/filesystems/incfs/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
-CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Werror -I../.. -I../../../../..
-LDLIBS := -llz4 -lzstd -lcrypto -lpthread
+CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Werror -I../.. -I../../../../.. -fno-omit-frame-pointer -fsanitize=address -g
+LDLIBS := -llz4 -lzstd -lcrypto -lpthread -fsanitize=address
 TEST_GEN_PROGS := incfs_test incfs_stress incfs_perf
 
 include ../../lib.mk
diff --git a/tools/testing/selftests/filesystems/incfs/utils.c b/tools/testing/selftests/filesystems/incfs/utils.c
index e60b0d36f49d..0411d912ae05 100644
--- a/tools/testing/selftests/filesystems/incfs/utils.c
+++ b/tools/testing/selftests/filesystems/incfs/utils.c
@@ -116,6 +116,9 @@ size_t format_signature(void **buf, const char *root_hash, const char *add_data)
 	size_t size = sizeof(struct signature_blob) + strlen(add_data) + 1;
 	struct signature_blob *sb = malloc(size);
 
+	if (!sb)
+		return 0;
+
 	*sb = (struct signature_blob){
 		.version = INCFS_SIGNATURE_VERSION,
 		.hash_section_size = sizeof(struct hash_section),
@@ -126,7 +129,7 @@ size_t format_signature(void **buf, const char *root_hash, const char *add_data)
 				.salt_size = 0,
 				.hash_size = SHA256_DIGEST_SIZE,
 			},
-		.signing_section_size = sizeof(uint32_t) + strlen(add_data) + 1,
+		.signing_section_size = strlen(add_data) + 1,
 	};
 
 	memcpy(sb->hash_section.hash, root_hash, SHA256_DIGEST_SIZE);