diff options
| author | Adam Jackson <ajax@redhat.com> | 2023-09-08 15:55:19 -0400 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2023-09-08 23:07:46 +0200 |
| commit | 92201f16cbcfd9eafe314ef6654be2ea7ba25675 (patch) | |
| tree | d5fa4e6e9d1c1d9deef34c425b669b84b5f8b5d1 | |
| parent | 5bdef6f27c91f45505ed5444147be4ed0e9bc3c7 (diff) | |
| download | glibc-92201f16cbcfd9eafe314ef6654be2ea7ba25675.tar.gz glibc-92201f16cbcfd9eafe314ef6654be2ea7ba25675.tar.xz glibc-92201f16cbcfd9eafe314ef6654be2ea7ba25675.zip | |
libio: Fix oversized __io_vtables
IO_VTABLES_LEN is the size of the struct array in bytes, not the number
of __IO_jump_t's in the array. Drops just under 384kb from .rodata on
LP64 machines.
Fixes: 3020f72618e ("libio: Remove the usage of __libc_IO_vtables")
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Tested-by: Florian Weimer <fweimer@redhat.com>
(cherry picked from commit 8cb69e054386f980f9ff4d93b157861d72b2019e)
| -rw-r--r-- | libio/vtables.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libio/vtables.c b/libio/vtables.c index 1d8ad612e9..34f7e15f1c 100644 --- a/libio/vtables.c +++ b/libio/vtables.c @@ -20,6 +20,7 @@ #include <libioP.h> #include <stdio.h> #include <ldsodefs.h> +#include <array_length.h> #include <pointer_guard.h> #include <libio-macros.h> @@ -88,7 +89,7 @@ # pragma weak __wprintf_buffer_as_file_xsputn #endif -const struct _IO_jump_t __io_vtables[IO_VTABLES_LEN] attribute_relro = +const struct _IO_jump_t __io_vtables[] attribute_relro = { /* _IO_str_jumps */ [IO_STR_JUMPS] = @@ -485,6 +486,8 @@ const struct _IO_jump_t __io_vtables[IO_VTABLES_LEN] attribute_relro = }, #endif }; +_Static_assert (array_length (__io_vtables) == IO_VTABLES_NUM, + "initializer count"); #ifdef SHARED |