From 0c8449ad90441ed5507458e7402506ccc409424d Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 26 Oct 2021 08:27:11 +0100 Subject: [PATCH] 10.20: Annocheck: Add more glibc function names --- annobin-global.h | 2 +- annocheck/hardened.c | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/annobin-global.h b/annobin-global.h index baab9c8..7a87d5f 100644 --- a/annobin-global.h +++ b/annobin-global.h @@ -19,7 +19,7 @@ extern "C" { /* The version of the package. NB/ This number is expected to be in the form "NNnn" where "NN" is major version number and "nn" is the minor version number. */ -#define ANNOBIN_VERSION 1019 +#define ANNOBIN_VERSION 1020 /* The version of the annotation specification supported. */ #define SPEC_VERSION 3 diff --git a/annocheck/hardened.c b/annocheck/hardened.c index 3cb3f2c..a3eca1e 100644 --- a/annocheck/hardened.c +++ b/annocheck/hardened.c @@ -1479,27 +1479,30 @@ skip_fortify_checks_for_function (annocheck_data * data, enum test_index check, { /* NB. KEEP THIS ARRAY ALPHA-SORTED */ "_GLOBAL__sub_I_main", - "_Unwind_Resume", /* In /sbin/ldconfig. */ - "__b64_ntop", /* Found in ppc64le, RHEL-9, /lib64/libresolv.so.2. */ - "__b64_pton", /* Found in ppc64le, RHEL-9, /lib64/libresolv.so.2. */ + "_Unwind_Resume", /* In /sbin/ldconfig. */ + "__b64_ntop", /* Found in ppc64le, RHEL-9, /lib64/libresolv.so.2. */ + "__b64_pton", /* Found in ppc64le, RHEL-9, /lib64/libresolv.so.2. */ "__ctype_get_mb_cur_max", "__libc_init_first", - "__libc_start_call_main", /* Found in ppc64le, RHEL-9, /lib64/libthread_db.so.1. */ + "__libc_start_call_main", /* Found in ppc64le, RHEL-9, /lib64/libthread_db.so.1. */ "__libc_start_main", "__librt_version_placeholder", /* Found in ppc64le, RHEL-9, /lib64/librt.so.1. */ - "__td_ta_rtld_global", /* Found in ppc64le, RHEL-9, /lib64/libthread_db.so.1. */ - "_dl_start_user", /* Found in ppc64le, RHEL-9, /lib64/ld64.so.2. */ - "_dl_tunable_set_arena_max", /* Found in ppc64le, RHEL-9, /lib64/libc_malloc_debug.so.0. */ + "__td_ta_rtld_global", /* Found in ppc64le, RHEL-9, /lib64/libthread_db.so.1. */ + "_dl_start_user", /* Found in ppc64le, RHEL-9, /lib64/ld64.so.2. */ + "_dl_tunable_set_arena_max", /* Found in ppc64le, RHEL-9, /lib64/libc_malloc_debug.so.0. */ + "_nl_archive_subfreeres", /* Found in x86_64, RHEL-8.6 /sbin/ldconfig. */ "_start", "blacklist_store_name", - "dlmopen_doit", /* Found in ppc64le, RHEL-9, /lib64/ld64.so.2. */ + "dlmopen_doit", /* Found in ppc64le, RHEL-9, /lib64/ld64.so.2. */ + "free_category", /* Found in x86_64, RHEL-8.6 /sbin/ldconfig. */ "free_derivation", "free_mem", + "insert_to_aux_cache.cold.6", /* Found in x86_64, RHEL-8.6 /sbin/ldconfig. */ "install_handler", "internal_setgrent", - "print_entry", /* In /sbin/ldconfig. */ - "td_init", /* Found in ppc64le, RHEL-9, /lib64/libthread_db.so.1. */ - "unlink_blk" /* Found in ppc64le, RHEL-9, /lib64/libc_malloc_debug.so.0. */ + "print_entry", /* In /sbin/ldconfig. */ + "td_init", /* Found in ppc64le, RHEL-9, /lib64/libthread_db.so.1. */ + "unlink_blk" /* Found in ppc64le, RHEL-9, /lib64/libc_malloc_debug.so.0. */ }; if (skip_this_func (non_fortify_funcs, ARRAY_SIZE (non_fortify_funcs), component_name)) -- 2.43.5