From fdaf78656fb6cc7caeb7b4e37068e8a8bf4dc639 Mon Sep 17 00:00:00 2001 From: Wilco Dijkstra Date: Fri, 10 Jun 2022 17:13:29 +0100 Subject: 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 --- sysdeps/s390/multiarch/ifunc-impl-list.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'sysdeps/s390') diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index c1902b2..5d0c730 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -66,9 +66,6 @@ #include #include -/* Maximum number of IFUNC implementations. */ -#define MAX_IFUNC 3 - /* Fill ARRAY of MAX elements with IFUNC implementations for function NAME supported on target machine and return the number of valid entries. */ @@ -76,9 +73,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; /* Get hardware information. */ unsigned long int dl_hwcap = GLRO (dl_hwcap); @@ -670,5 +665,5 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WMEMCMP_IFUNC */ - return i; + return 0; } -- cgit v1.1