Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 1 | From 3ea08e491a8494ff03e598b5e0fc2d8131e75da9 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 18 Mar 2015 01:51:38 +0000 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 4 | Subject: [PATCH] nativesdk-glibc: Raise the size of arrays containing dl paths |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 5 | |
| 6 | This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings |
| 7 | and lengths as well as ld.so.cache path in the dynamic loader to specific |
| 8 | sections in memory. The sections that contain paths have been allocated a 4096 |
| 9 | byte section, which is the maximum path length in linux. This will allow the |
| 10 | relocating script to parse the ELF binary, detect the section and easily replace |
| 11 | the strings in a certain path. |
| 12 | |
| 13 | Upstream-Status: Inappropriate [SDK specific] |
| 14 | |
| 15 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> |
| 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 17 | --- |
| 18 | elf/dl-cache.c | 4 ++++ |
| 19 | elf/dl-load.c | 4 ++-- |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 20 | elf/dl-usage.c | 6 ++++-- |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 21 | elf/interp.c | 2 +- |
| 22 | elf/ldconfig.c | 3 +++ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 23 | elf/rtld.c | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 24 | iconv/gconv_conf.c | 2 +- |
| 25 | sysdeps/generic/dl-cache.h | 4 ---- |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 26 | 8 files changed, 16 insertions(+), 10 deletions(-) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 27 | |
| 28 | diff --git a/elf/dl-cache.c b/elf/dl-cache.c |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 29 | index 32f3bef5ea..71f3a82dc0 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 30 | --- a/elf/dl-cache.c |
| 31 | +++ b/elf/dl-cache.c |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 32 | @@ -359,6 +359,10 @@ search_cache (const char *string_table, uint32_t string_table_size, |
| 33 | return best; |
| 34 | } |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 35 | |
| 36 | +const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))) = |
| 37 | + SYSCONFDIR "/ld.so.cache"; |
| 38 | + |
| 39 | + |
| 40 | int |
| 41 | _dl_cache_libcmp (const char *p1, const char *p2) |
| 42 | { |
| 43 | diff --git a/elf/dl-load.c b/elf/dl-load.c |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 44 | index f455207e79..a144e24fcf 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 45 | --- a/elf/dl-load.c |
| 46 | +++ b/elf/dl-load.c |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 47 | @@ -115,8 +115,8 @@ enum { ncapstr = 1, max_capstrlen = 0 }; |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 48 | gen-trusted-dirs.awk. */ |
| 49 | #include "trusted-dirs.h" |
| 50 | |
| 51 | -static const char system_dirs[] = SYSTEM_DIRS; |
| 52 | -static const size_t system_dirs_len[] = |
| 53 | +static const char system_dirs[4096] __attribute__ ((section (".sysdirs"))) = SYSTEM_DIRS; |
| 54 | +volatile static const size_t system_dirs_len[] __attribute__ ((section (".sysdirslen"))) = |
| 55 | { |
| 56 | SYSTEM_DIRS_LEN |
| 57 | }; |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 58 | diff --git a/elf/dl-usage.c b/elf/dl-usage.c |
| 59 | index 6e26818bd7..f09e8b93e5 100644 |
| 60 | --- a/elf/dl-usage.c |
| 61 | +++ b/elf/dl-usage.c |
| 62 | @@ -25,6 +25,8 @@ |
| 63 | #include <dl-procinfo.h> |
| 64 | #include <dl-hwcaps.h> |
| 65 | |
| 66 | +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); |
| 67 | + |
| 68 | void |
| 69 | _dl_usage (const char *argv0, const char *wrong_option) |
| 70 | { |
| 71 | @@ -244,7 +246,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ |
| 72 | --list list all dependencies and how they are resolved\n\ |
| 73 | --verify verify that given object really is a dynamically linked\n\ |
| 74 | object we can handle\n\ |
| 75 | - --inhibit-cache Do not use " LD_SO_CACHE "\n\ |
| 76 | + --inhibit-cache Do not use %s\n\ |
| 77 | --library-path PATH use given PATH instead of content of the environment\n\ |
| 78 | variable LD_LIBRARY_PATH\n\ |
| 79 | --glibc-hwcaps-prepend LIST\n\ |
| 80 | @@ -266,7 +268,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ |
| 81 | \n\ |
| 82 | This program interpreter self-identifies as: " RTLD "\n\ |
| 83 | ", |
| 84 | - argv0); |
| 85 | + argv0, LD_SO_CACHE); |
| 86 | print_search_path_for_help (state); |
| 87 | print_hwcaps_subdirectories (state); |
| 88 | print_legacy_hwcap_directories (); |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 89 | diff --git a/elf/interp.c b/elf/interp.c |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 90 | index 91966702ca..dc86c20e83 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 91 | --- a/elf/interp.c |
| 92 | +++ b/elf/interp.c |
| 93 | @@ -18,5 +18,5 @@ |
| 94 | |
| 95 | #include <runtime-linker.h> |
| 96 | |
| 97 | -const char __invoke_dynamic_linker__[] __attribute__ ((section (".interp"))) |
| 98 | +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) |
| 99 | = RUNTIME_LINKER; |
| 100 | diff --git a/elf/ldconfig.c b/elf/ldconfig.c |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 101 | index 28ed637a29..5d38a60c5d 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 102 | --- a/elf/ldconfig.c |
| 103 | +++ b/elf/ldconfig.c |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 104 | @@ -176,6 +176,9 @@ static struct argp argp = |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 105 | options, parse_opt, NULL, doc, NULL, more_help, NULL |
| 106 | }; |
| 107 | |
| 108 | + |
| 109 | +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); |
| 110 | + |
| 111 | /* Check if string corresponds to an important hardware capability or |
| 112 | a platform. */ |
| 113 | static int |
| 114 | diff --git a/elf/rtld.c b/elf/rtld.c |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 115 | index 596b6ac3d9..1ccd33f668 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 116 | --- a/elf/rtld.c |
| 117 | +++ b/elf/rtld.c |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 118 | @@ -185,6 +185,7 @@ dso_name_valid_for_suid (const char *p) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 119 | } |
| 120 | return *p != '\0'; |
| 121 | } |
| 122 | +extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))); |
| 123 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 124 | static void |
| 125 | audit_list_init (struct audit_list *list) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 126 | diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 127 | index 682f949834..7eed87bc9d 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 128 | --- a/iconv/gconv_conf.c |
| 129 | +++ b/iconv/gconv_conf.c |
| 130 | @@ -36,7 +36,7 @@ |
| 131 | |
| 132 | |
| 133 | /* This is the default path where we look for module lists. */ |
| 134 | -static const char default_gconv_path[] = GCONV_PATH; |
| 135 | +static char default_gconv_path[4096] __attribute__ ((section (".gccrelocprefix"))) = GCONV_PATH; |
| 136 | |
| 137 | /* Type to represent search path. */ |
| 138 | struct path_elem |
| 139 | diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 140 | index 964d50a486..94bf68ca9d 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 141 | --- a/sysdeps/generic/dl-cache.h |
| 142 | +++ b/sysdeps/generic/dl-cache.h |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 143 | @@ -34,10 +34,6 @@ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 144 | ((flags) == 1 || (flags) == _DL_CACHE_DEFAULT_ID) |
| 145 | #endif |
| 146 | |
| 147 | -#ifndef LD_SO_CACHE |
| 148 | -# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" |
| 149 | -#endif |
| 150 | - |
| 151 | #ifndef add_system_dir |
| 152 | # define add_system_dir(dir) add_dir (dir) |
| 153 | #endif |