diff options
author | Wilco Dijkstra <wilco.dijkstra@arm.com> | 2022-06-10 17:13:29 +0100 |
---|---|---|
committer | Wilco Dijkstra <wdijkstr@arm.com> | 2022-06-10 17:13:29 +0100 |
commit | fdaf78656fb6cc7caeb7b4e37068e8a8bf4dc639 (patch) | |
tree | 05302f7351e2b505af1d50d165bbbe371123d15d /sysdeps/x86_64/multiarch | |
parent | f107b7b30d815f191181617e2c14f21e6af4ddcf (diff) | |
download | glibc-fdaf78656fb6cc7caeb7b4e37068e8a8bf4dc639.tar.gz glibc-fdaf78656fb6cc7caeb7b4e37068e8a8bf4dc639.tar.xz glibc-fdaf78656fb6cc7caeb7b4e37068e8a8bf4dc639.zip |
Add bounds check to __libc_ifunc_impl_list
Add a proper bounds check to __libc_ifunc_impl_list. This makes MAX_IFUNC redundant and fixes several targets that will write outside the array. To avoid unnecessary large diffs, pass the maximum in the argument 'i' to IFUNC_IMPL_ADD - 'max' can be used in new ifunc definitions and existing ones can be updated if desired. Passes buildmanyglibc. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/x86_64/multiarch')
-rw-r--r-- | sysdeps/x86_64/multiarch/ifunc-impl-list.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c index 58f3ec8306..dc595752e0 100644 --- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c +++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c @@ -23,9 +23,6 @@ #include <sysdep.h> #include "init-arch.h" -/* Maximum number of IFUNC implementations. */ -#define MAX_IFUNC 5 - /* Fill ARRAY of MAX elements with IFUNC implementations for function NAME supported on target machine and return the number of valid entries. */ @@ -34,9 +31,7 @@ size_t __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, size_t max) { - assert (max >= MAX_IFUNC); - - size_t i = 0; + size_t i = max; /* Support sysdeps/x86_64/multiarch/memcmpeq.c. */ IFUNC_IMPL (i, name, __memcmpeq, @@ -1015,5 +1010,5 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __wmemset_chk_avx512_unaligned)) #endif - return i; + return 0; } |