about summary refs log tree commit diff
path: root/sysdeps/aarch64/multiarch
diff options
context:
space:
mode:
authorWilco Dijkstra <wilco.dijkstra@arm.com>2022-06-10 17:13:29 +0100
committerWilco Dijkstra <wdijkstr@arm.com>2022-06-10 17:13:29 +0100
commitfdaf78656fb6cc7caeb7b4e37068e8a8bf4dc639 (patch)
tree05302f7351e2b505af1d50d165bbbe371123d15d /sysdeps/aarch64/multiarch
parentf107b7b30d815f191181617e2c14f21e6af4ddcf (diff)
downloadglibc-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/aarch64/multiarch')
-rw-r--r--sysdeps/aarch64/multiarch/ifunc-impl-list.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sysdeps/aarch64/multiarch/ifunc-impl-list.c b/sysdeps/aarch64/multiarch/ifunc-impl-list.c
index f6c6d008da..4144615ab2 100644
--- a/sysdeps/aarch64/multiarch/ifunc-impl-list.c
+++ b/sysdeps/aarch64/multiarch/ifunc-impl-list.c
@@ -24,16 +24,11 @@
 #include <init-arch.h>
 #include <stdio.h>
 
-/* Maximum number of IFUNC implementations.  */
-#define MAX_IFUNC	8
-
 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;
 
   INIT_ARCH ();
 
@@ -76,5 +71,5 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 	      IFUNC_IMPL_ADD (array, i, strlen, !mte, __strlen_asimd)
 	      IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_mte))
 
-  return i;
+  return 0;
 }