From 1c82e0625f7d340e9f6335d1c9dfbab6e1d0688d Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Wed, 24 May 2023 04:31:56 +0200 Subject: [PATCH 1/2] Fixed invalid use of ndpi_free(). Sorry, my fault. Signed-off-by: Toni Uhlig --- src/lib/third_party/src/gcrypt/aesni.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/third_party/src/gcrypt/aesni.c b/src/lib/third_party/src/gcrypt/aesni.c index 3ddf8cabe53..d1379de6f95 100644 --- a/src/lib/third_party/src/gcrypt/aesni.c +++ b/src/lib/third_party/src/gcrypt/aesni.c @@ -97,7 +97,7 @@ int mbedtls_aesni_has_support( unsigned int what ) break; /* We giveup */ } - ndpi_free(line); + free(line); fclose(fd); has_aesni_checked = 1; From b728fe0277d4ce3af791d88039e92746770c5664 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Wed, 24 May 2023 12:15:55 +0200 Subject: [PATCH 2/2] Fine tuned symbol check script. * added check for expected syms in modules Signed-off-by: Toni Uhlig --- src/lib/third_party/src/gcrypt/aesni.c | 2 +- utils/check_symbols.sh | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/lib/third_party/src/gcrypt/aesni.c b/src/lib/third_party/src/gcrypt/aesni.c index d1379de6f95..ecce04fc572 100644 --- a/src/lib/third_party/src/gcrypt/aesni.c +++ b/src/lib/third_party/src/gcrypt/aesni.c @@ -97,7 +97,7 @@ int mbedtls_aesni_has_support( unsigned int what ) break; /* We giveup */ } - free(line); + free(line); // Do not replace with ndpi_free(). See `man 3 getline`. fclose(fd); has_aesni_checked = 1; diff --git a/utils/check_symbols.sh b/utils/check_symbols.sh index 32f4fac89ac..5ab064c184d 100755 --- a/utils/check_symbols.sh +++ b/utils/check_symbols.sh @@ -24,7 +24,21 @@ for line in `nm -P -u "${NDPI_LIB}"`; do if [ ! -z "${FOUND_SYMBOL}" ]; then SKIP=0 case "${CURRENT_OBJECT}" in - '[ndpi_utils.o]'|'[ndpi_memory.o]'|'[roaring.o]') SKIP=1 ;; + '[roaring.o]') + case "${FOUND_SYMBOL}" in + 'malloc'|'calloc'|'realloc'|'free') SKIP=1 ;; + esac + ;; + '[ndpi_utils.o]'|'[ndpi_memory.o]'|'[roaring.o]') + case "${FOUND_SYMBOL}" in + 'malloc'|'calloc'|'free') SKIP=1 ;; + esac + ;; + '[gcrypt_light.o]') + case "${FOUND_SYMBOL}" in + 'free') SKIP=1 ;; + esac + ;; esac if [ ${SKIP} -eq 0 ]; then