xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: selftests: incfs: Add -fno-omit-frame-pointer

Browse Source 
Without it incfs/incfs_perf runtime fails in format_signature:

malloc(): invalid size (unsorted)
Aborted

When compiled with gcc version 11.2.0.

Also add check for NULL after the malloc, and remove unneeded
space for uint32_t in signing_section.

Bug: 211066171

Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org>
Change-Id: I62b775140e4b89f75335cbd65665cf6a3e0fe964
This commit is contained in:
Tadeusz Struk
2022-03-09 17:30:38 -08:00
parent 3e45af8a72
commit 3b25a439ce
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/testing/selftests/filesystems/incfs/Makefile
View File

@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Werror -I../.. -I../../../../.. CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Werror -I../.. -I../../../../.. -fno-omit-frame-pointer -fsanitize=address -g
LDLIBS := -llz4 -lzstd -lcrypto -lpthread LDLIBS := -llz4 -lzstd -lcrypto -lpthread -fsanitize=address
TEST_GEN_PROGS := incfs_test incfs_stress incfs_perf TEST_GEN_PROGS := incfs_test incfs_stress incfs_perf
include ../../lib.mk include ../../lib.mk

5
tools/testing/selftests/filesystems/incfs/utils.c
View File

@@ -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; size_t size = sizeof(struct signature_blob) + strlen(add_data) + 1;
struct signature_blob *sb = malloc(size); struct signature_blob *sb = malloc(size);
if (!sb)
return 0;
*sb = (struct signature_blob){ *sb = (struct signature_blob){
.version = INCFS_SIGNATURE_VERSION, .version = INCFS_SIGNATURE_VERSION,
.hash_section_size = sizeof(struct hash_section), .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, .salt_size = 0,
.hash_size = SHA256_DIGEST_SIZE, .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); memcpy(sb->hash_section.hash, root_hash, SHA256_DIGEST_SIZE);