/[gentoo-projects]/pax-utils/scanelf.c
Gentoo

Diff of /pax-utils/scanelf.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.229 Revision 1.276
1/* 1/*
2 * Copyright 2003-2007 Gentoo Foundation 2 * Copyright 2003-2012 Gentoo Foundation
3 * Distributed under the terms of the GNU General Public License v2 3 * Distributed under the terms of the GNU General Public License v2
4 * $Header: /var/cvsroot/gentoo-projects/pax-utils/Attic/scanelf.c,v 1.229 2011/09/27 19:29:19 vapier Exp $ 4 * $Header: /var/cvsroot/gentoo-projects/pax-utils/Attic/scanelf.c,v 1.276 2015/02/28 22:57:40 vapier Exp $
5 * 5 *
6 * Copyright 2003-2007 Ned Ludd - <solar@gentoo.org> 6 * Copyright 2003-2012 Ned Ludd - <solar@gentoo.org>
7 * Copyright 2004-2007 Mike Frysinger - <vapier@gentoo.org> 7 * Copyright 2004-2012 Mike Frysinger - <vapier@gentoo.org>
8 */ 8 */
9 9
10static const char *rcsid = "$Id: scanelf.c,v 1.229 2011/09/27 19:29:19 vapier Exp $"; 10static const char rcsid[] = "$Id: scanelf.c,v 1.276 2015/02/28 22:57:40 vapier Exp $";
11const char argv0[] = "scanelf"; 11const char argv0[] = "scanelf";
12 12
13#include "paxinc.h" 13#include "paxinc.h"
14 14
15#define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+') 15#define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+')
16 16
17/* prototypes */ 17/* prototypes */
18static int file_matches_list(const char *filename, char **matchlist); 18static int file_matches_list(const char *filename, char **matchlist);
19 19
20/* variables to control behavior */ 20/* variables to control behavior */
21static char *match_etypes = NULL; 21static array_t _match_etypes = array_init_decl, *match_etypes = &_match_etypes;
22static array_t _ldpaths = array_init_decl, *ldpaths = &_ldpaths; 22static array_t _ldpaths = array_init_decl, *ldpaths = &_ldpaths;
23static char scan_ldpath = 0; 23static char scan_ldpath = 0;
24static char scan_envpath = 0; 24static char scan_envpath = 0;
25static char scan_symlink = 1; 25static char scan_symlink = 1;
26static char scan_archives = 0; 26static char scan_archives = 0;
44static char be_quiet = 0; 44static char be_quiet = 0;
45static char be_verbose = 0; 45static char be_verbose = 0;
46static char be_wewy_wewy_quiet = 0; 46static char be_wewy_wewy_quiet = 0;
47static char be_semi_verbose = 0; 47static char be_semi_verbose = 0;
48static char *find_sym = NULL; 48static char *find_sym = NULL;
49static array_t _find_sym_arr = array_init_decl, *find_sym_arr = &_find_sym_arr;
50static array_t _find_sym_regex_arr = array_init_decl, *find_sym_regex_arr = &_find_sym_regex_arr;
49static char *find_lib = NULL; 51static char *find_lib = NULL;
50static array_t _find_lib_arr = array_init_decl, *find_lib_arr = &_find_lib_arr; 52static array_t _find_lib_arr = array_init_decl, *find_lib_arr = &_find_lib_arr;
51static char *find_section = NULL; 53static char *find_section = NULL;
52static array_t _find_section_arr = array_init_decl, *find_section_arr = &_find_section_arr; 54static array_t _find_section_arr = array_init_decl, *find_section_arr = &_find_section_arr;
53static char *out_format = NULL; 55static char *out_format = NULL;
54static char *search_path = NULL; 56static char *search_path = NULL;
55static char fix_elf = 0; 57static char fix_elf = 0;
56static char g_match = 0; 58static char g_match = 0;
57static char use_ldcache = 0; 59static char use_ldcache = 0;
60static char use_ldpath = 0;
58 61
59static char **qa_textrels = NULL; 62static char **qa_textrels = NULL;
60static char **qa_execstack = NULL; 63static char **qa_execstack = NULL;
61static char **qa_wx_load = NULL; 64static char **qa_wx_load = NULL;
62static char *root; 65static int root_fd = AT_FDCWD;
63 66
64static int match_bits = 0; 67static int match_bits = 0;
65static unsigned int match_perms = 0; 68static unsigned int match_perms = 0;
66static void *ldcache = NULL; 69static void *ldcache = NULL;
67static size_t ldcache_size = 0; 70static size_t ldcache_size = 0;
68static unsigned long setpax = 0UL; 71static unsigned long setpax = 0UL;
69 72
70static int has_objdump = 0; 73static const char *objdump;
71 74
72/* find the path to a file by name */ 75/* Find the path to a file by name. Note: we do not currently handle the
73static char *which(const char *fname) 76 * empty path element correctly (should behave by searching $PWD). */
77static const char *which(const char *fname, const char *envvar)
74{ 78{
75 static char fullpath[__PAX_UTILS_PATH_MAX]; 79 size_t path_len, fname_len;
80 const char *env_path;
76 char *path, *p; 81 char *path, *p, *ep;
77 82
83 p = getenv(envvar);
84 if (p)
85 return p;
86
78 path = getenv("PATH"); 87 env_path = getenv("PATH");
79 if (!path) 88 if (!env_path)
80 return NULL; 89 return NULL;
81 90
82 path = xstrdup(path); 91 /* Create a copy of the $PATH that we can safely modify.
83 while ((p = strrchr(path, ':')) != NULL) { 92 * Make it a little bigger so we can append "/fname".
84 snprintf(fullpath, sizeof(fullpath), "%s/%s", p + 1, fname); 93 * We do this twice -- once for a perm copy, and once for
85 *p = 0; 94 * room at the end of the last element. */
95 path_len = strlen(env_path);
96 fname_len = strlen(fname);
97 path = xmalloc(path_len + (fname_len * 2) + 2 + 2);
98 memcpy(path, env_path, path_len + 1);
99
100 p = path + path_len + 1 + fname_len + 1;
101 *p = '/';
102 memcpy(p + 1, fname, fname_len + 1);
103
104 /* Repoint fname to the copy in the env string as it has
105 * the leading slash which we can include in a single memcpy.
106 * Increase the fname len to include the '/' and '\0'. */
107 fname = p;
108 fname_len += 2;
109
110 p = path;
111 while (p) {
112 ep = strchr(p, ':');
113 /* Append the /foo path to the current element. */
114 if (ep)
115 memcpy(ep, fname, fname_len);
116 else
117 memcpy(path + path_len, fname, fname_len);
118
86 if (access(fullpath, R_OK) != -1) { 119 if (access(p, R_OK) != -1)
87 free(path);
88 return fullpath; 120 return p;
121
122 p = ep;
123 if (ep) {
124 /* If not the last element, restore the chunk we clobbered. */
125 size_t offset = ep - path;
126 size_t restore = min(path_len - offset, fname_len);
127 memcpy(ep, env_path + offset, restore);
128 ++p;
89 } 129 }
90 } 130 }
131
91 free(path); 132 free(path);
92 return NULL; 133 return NULL;
93} 134}
94 135
95/* 1 on failure. 0 otherwise */ 136static FILE *fopenat_r(int dir_fd, const char *path)
96static int rematch(const char *regex, const char *match, int cflags)
97{ 137{
98 regex_t preg; 138 int fd = openat(dir_fd, path, O_RDONLY|O_CLOEXEC);
99 int ret; 139 if (fd == -1)
140 return NULL;
141 return fdopen(fd, "re");
142}
100 143
101 if ((match == NULL) || (regex == NULL)) 144static const char *root_rel_path(const char *path)
102 return EXIT_FAILURE; 145{
103 146 /*
104 if ((ret = regcomp(&preg, regex, cflags))) { 147 * openat() will ignore the dirfd if path starts with
105 char err[256]; 148 * a /, so consume all of that noise
106 149 *
107 if (regerror(ret, &preg, err, sizeof(err))) 150 * XXX: we don't handle relative paths like ../ that
108 fprintf(stderr, "regcomp failed: %s", err); 151 * break out of the --root option, but for now, just
109 else 152 * don't do that :P.
110 fprintf(stderr, "regcomp failed"); 153 */
111 154 if (root_fd != AT_FDCWD) {
112 return EXIT_FAILURE; 155 while (*path == '/')
156 ++path;
157 if (*path == '\0')
158 path = ".";
113 } 159 }
114 ret = regexec(&preg, match, 0, NULL, 0);
115 regfree(&preg);
116 160
117 return ret; 161 return path;
118} 162}
119 163
120/* sub-funcs for scanelf_file() */ 164/* sub-funcs for scanelf_fileat() */
121static void scanelf_file_get_symtabs(elfobj *elf, void **sym, void **tab) 165static void scanelf_file_get_symtabs(elfobj *elf, void **sym, void **str)
122{ 166{
123 /* find the best SHT_DYNSYM and SHT_STRTAB sections */ 167 /* find the best SHT_DYNSYM and SHT_STRTAB sections */
124 168
125 /* debug sections */ 169 /* debug sections */
126 void *symtab = elf_findsecbyname(elf, ".symtab"); 170 void *symtab = elf_findsecbyname(elf, ".symtab");
127 void *strtab = elf_findsecbyname(elf, ".strtab"); 171 void *strtab = elf_findsecbyname(elf, ".strtab");
128 /* runtime sections */ 172 /* runtime sections */
129 void *dynsym = elf_findsecbyname(elf, ".dynsym"); 173 void *dynsym = elf_findsecbyname(elf, ".dynsym");
130 void *dynstr = elf_findsecbyname(elf, ".dynstr"); 174 void *dynstr = elf_findsecbyname(elf, ".dynstr");
131 175
176 /*
177 * If the sections are marked NOBITS, then they don't exist, so we just
178 * skip them. This let's us work sanely with splitdebug ELFs (rather
179 * than spewing a lot of "corrupt ELF" messages later on). In malformed
180 * ELFs, the section might be wrongly set to NOBITS, but screw em.
181 *
182 * We need to make sure the debug/runtime sym/str sets are used together
183 * as they are generated in sync. Trying to mix them won't work.
184 */
132#define GET_SYMTABS(B) \ 185#define GET_SYMTABS(B) \
133 if (elf->elf_class == ELFCLASS ## B) { \ 186 if (elf->elf_class == ELFCLASS ## B) { \
134 if (symtab && dynsym) { \
135 Elf ## B ## _Shdr *esymtab = symtab; \ 187 Elf ## B ## _Shdr *esymtab = symtab; \
136 Elf ## B ## _Shdr *edynsym = dynsym; \
137 *sym = (EGET(esymtab->sh_size) > EGET(edynsym->sh_size)) ? symtab : dynsym; \
138 } else \
139 *sym = symtab ? symtab : dynsym; \
140 if (strtab && dynstr) { \
141 Elf ## B ## _Shdr *estrtab = strtab; \ 188 Elf ## B ## _Shdr *estrtab = strtab; \
189 Elf ## B ## _Shdr *edynsym = dynsym; \
142 Elf ## B ## _Shdr *edynstr = dynstr; \ 190 Elf ## B ## _Shdr *edynstr = dynstr; \
143 *tab = (EGET(estrtab->sh_size) > EGET(edynstr->sh_size)) ? strtab : dynstr; \ 191 \
192 if (!VALID_SHDR(elf, esymtab)) \
193 symtab = NULL; \
194 if (!VALID_SHDR(elf, edynsym)) \
195 dynsym = NULL; \
196 if (!VALID_SHDR(elf, estrtab)) \
197 strtab = NULL; \
198 if (!VALID_SHDR(elf, edynstr)) \
199 dynstr = NULL; \
200 \
201 /* Use the set with more symbols if both exist. */ \
202 if (symtab && dynsym && strtab && dynstr) { \
203 if (EGET(esymtab->sh_size) > EGET(edynsym->sh_size)) \
204 goto debug##B; \
205 else \
206 goto runtime##B; \
207 } else if (symtab && strtab) { \
208 debug##B: \
209 *sym = symtab; \
210 *str = strtab; \
211 return; \
212 } else if (dynsym && dynstr) { \
213 runtime##B: \
214 *sym = dynsym; \
215 *str = dynstr; \
216 return; \
144 } else \ 217 } else { \
145 *tab = strtab ? strtab : dynstr; \ 218 *sym = *str = NULL; \
219 } \
146 } 220 }
147 GET_SYMTABS(32) 221 GET_SYMTABS(32)
148 GET_SYMTABS(64) 222 GET_SYMTABS(64)
223
224 if (*sym && *str)
225 return;
226
227 /*
228 * damn, they're really going to make us work for it huh?
229 * reconstruct the section header info out of the dynamic
230 * tags so we can see what symbols this guy uses at runtime.
231 */
232 if (!elf->phdr)
233 return;
234#define GET_SYMTABS_DT(B) \
235 if (elf->elf_class == ELFCLASS ## B) { \
236 size_t i; \
237 static Elf ## B ## _Shdr sym_shdr, str_shdr; \
238 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
239 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \
240 Elf ## B ## _Addr vsym, vstr, vhash, vgnu_hash; \
241 Elf ## B ## _Dyn *dyn; \
242 Elf ## B ## _Off offset; \
243 \
244 /* lookup symbols used at runtime with DT_SYMTAB / DT_STRTAB */ \
245 vsym = vstr = vhash = vgnu_hash = 0; \
246 memset(&sym_shdr, 0, sizeof(sym_shdr)); \
247 memset(&str_shdr, 0, sizeof(str_shdr)); \
248 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
249 if (EGET(phdr[i].p_type) != PT_DYNAMIC) \
250 continue; \
251 \
252 offset = EGET(phdr[i].p_offset); \
253 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) \
254 continue; \
255 \
256 dyn = DYN ## B (elf->vdata + offset); \
257 while (EGET(dyn->d_tag) != DT_NULL) { \
258 switch (EGET(dyn->d_tag)) { \
259 case DT_SYMTAB: vsym = EGET(dyn->d_un.d_val); break; \
260 case DT_SYMENT: sym_shdr.sh_entsize = dyn->d_un.d_val; break; \
261 case DT_STRTAB: vstr = EGET(dyn->d_un.d_val); break; \
262 case DT_STRSZ: str_shdr.sh_size = dyn->d_un.d_val; break; \
263 case DT_HASH: vhash = EGET(dyn->d_un.d_val); break; \
264 /*case DT_GNU_HASH: vgnu_hash = EGET(dyn->d_un.d_val); break;*/ \
265 } \
266 ++dyn; \
267 } \
268 if (vsym && vstr) \
269 break; \
270 } \
271 if (!vsym || !vstr || !(vhash || vgnu_hash)) \
272 return; \
273 \
274 /* calc offset into the ELF by finding the load addr of the syms */ \
275 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
276 Elf ## B ## _Addr vaddr = EGET(phdr[i].p_vaddr); \
277 Elf ## B ## _Addr filesz = EGET(phdr[i].p_filesz); \
278 offset = EGET(phdr[i].p_offset); \
279 \
280 if (EGET(phdr[i].p_type) != PT_LOAD) \
281 continue; \
282 \
283 if (vhash >= vaddr && vhash < vaddr + filesz) { \
284 /* Scan the hash table to see how many entries we have */ \
285 Elf32_Word max_sym_idx = 0; \
286 Elf32_Word *hashtbl = elf->vdata + offset + (vhash - vaddr); \
287 Elf32_Word b, nbuckets = EGET(hashtbl[0]); \
288 Elf32_Word nchains = EGET(hashtbl[1]); \
289 Elf32_Word *buckets = &hashtbl[2]; \
290 Elf32_Word *chains = &buckets[nbuckets]; \
291 Elf32_Word sym_idx; \
292 Elf32_Word chained; \
293 \
294 for (b = 0; b < nbuckets; ++b) { \
295 if (!buckets[b]) \
296 continue; \
297 for (sym_idx = buckets[b], chained = 0; \
298 sym_idx < nchains && sym_idx && chained <= nchains; \
299 sym_idx = chains[sym_idx], ++chained) { \
300 if (max_sym_idx < sym_idx) \
301 max_sym_idx = sym_idx; \
302 } \
303 if (chained > nchains) { \
304 warnf("corrupt ELF bucket"); \
305 break; \
306 } \
307 } \
308 ESET(sym_shdr.sh_size, sym_shdr.sh_entsize * max_sym_idx); \
309 } \
310 \
311 if (vsym >= vaddr && vsym < vaddr + filesz) { \
312 ESET(sym_shdr.sh_offset, offset + (vsym - vaddr)); \
313 *sym = &sym_shdr; \
314 } \
315 \
316 if (vstr >= vaddr && vstr < vaddr + filesz) { \
317 ESET(str_shdr.sh_offset, offset + (vstr - vaddr)); \
318 *str = &str_shdr; \
319 } \
320 } \
321 }
322 GET_SYMTABS_DT(32)
323 GET_SYMTABS_DT(64)
149} 324}
150 325
151static char *scanelf_file_pax(elfobj *elf, char *found_pax) 326static char *scanelf_file_pax(elfobj *elf, char *found_pax)
152{ 327{
153 static char ret[7]; 328 static char ret[7];
180 } 355 }
181 SHOW_PAX(32) 356 SHOW_PAX(32)
182 SHOW_PAX(64) 357 SHOW_PAX(64)
183 } 358 }
184 359
185 if (fix_elf && setpax) { 360 /* Note: We do not support setting EI_PAX if not PT_PAX_FLAGS
186 /* set the chpax settings */ 361 * was found. This is known to break ELFs on glibc systems,
187 if (elf->elf_class == ELFCLASS32) { 362 * and mainline PaX has deprecated use of this for a long time.
188 if (EHDR32(elf->ehdr)->e_type == ET_DYN || EHDR32(elf->ehdr)->e_type == ET_EXEC) 363 * We could support changing PT_GNU_STACK, but that doesn't
189 ESET(EHDR32(elf->ehdr)->e_ident[EI_PAX], pax_pf2hf_flags(setpax)); 364 * seem like it's worth the effort. #411919
190 } else { 365 */
191 if (EHDR64(elf->ehdr)->e_type == ET_DYN || EHDR64(elf->ehdr)->e_type == ET_EXEC)
192 ESET(EHDR64(elf->ehdr)->e_ident[EI_PAX], pax_pf2hf_flags(setpax));
193 }
194 }
195 366
196 /* fall back to EI_PAX if no PT_PAX was found */ 367 /* fall back to EI_PAX if no PT_PAX was found */
197 if (!*ret) { 368 if (!*ret) {
198 static char *paxflags; 369 static char *paxflags;
199 paxflags = pax_short_hf_flags(EI_PAX_FLAGS(elf)); 370 paxflags = pax_short_hf_flags(EI_PAX_FLAGS(elf));
213static char *scanelf_file_phdr(elfobj *elf, char *found_phdr, char *found_relro, char *found_load) 384static char *scanelf_file_phdr(elfobj *elf, char *found_phdr, char *found_relro, char *found_load)
214{ 385{
215 static char ret[12]; 386 static char ret[12];
216 char *found; 387 char *found;
217 unsigned long i, shown, multi_stack, multi_relro, multi_load; 388 unsigned long i, shown, multi_stack, multi_relro, multi_load;
218 int max_pt_load;
219 389
220 if (!show_phdr) return NULL; 390 if (!show_phdr) return NULL;
221 391
222 memcpy(ret, "--- --- ---\0", 12); 392 memcpy(ret, "--- --- ---\0", 12);
223 393
224 shown = 0; 394 shown = 0;
225 multi_stack = multi_relro = multi_load = 0; 395 multi_stack = multi_relro = multi_load = 0;
226 max_pt_load = elf_max_pt_load(elf);
227 396
228#define NOTE_GNU_STACK ".note.GNU-stack" 397#define NOTE_GNU_STACK ".note.GNU-stack"
229#define SHOW_PHDR(B) \ 398#define SHOW_PHDR(B) \
230 if (elf->elf_class == ELFCLASS ## B) { \ 399 if (elf->elf_class == ELFCLASS ## B) { \
231 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \ 400 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
247 warnf("%s: multiple PT_GNU_RELRO's !?", elf->filename); \ 416 warnf("%s: multiple PT_GNU_RELRO's !?", elf->filename); \
248 found = found_relro; \ 417 found = found_relro; \
249 offset = 4; \ 418 offset = 4; \
250 check_flags = PF_X; \ 419 check_flags = PF_X; \
251 } else if (EGET(phdr[i].p_type) == PT_LOAD) { \ 420 } else if (EGET(phdr[i].p_type) == PT_LOAD) { \
252 if (EGET(ehdr->e_type) == ET_DYN || EGET(ehdr->e_type) == ET_EXEC) \
253 if (multi_load++ > max_pt_load) \
254 warnf("%s: more than %i PT_LOAD's !?", elf->filename, max_pt_load); \
255 if (file_matches_list(elf->filename, qa_wx_load)) \ 421 if (file_matches_list(elf->filename, qa_wx_load)) \
256 continue; \ 422 continue; \
257 found = found_load; \ 423 found = found_load; \
258 offset = 8; \ 424 offset = 8; \
259 check_flags = PF_W|PF_X; \ 425 check_flags = PF_W|PF_X; \
273 } \ 439 } \
274 } else if (elf->shdr != NULL) { \ 440 } else if (elf->shdr != NULL) { \
275 /* no program headers which means this is prob an object file */ \ 441 /* no program headers which means this is prob an object file */ \
276 Elf ## B ## _Shdr *shdr = SHDR ## B (elf->shdr); \ 442 Elf ## B ## _Shdr *shdr = SHDR ## B (elf->shdr); \
277 Elf ## B ## _Shdr *strtbl = shdr + EGET(ehdr->e_shstrndx); \ 443 Elf ## B ## _Shdr *strtbl = shdr + EGET(ehdr->e_shstrndx); \
278 char *str; \
279 if ((void*)strtbl > elf->data_end) \ 444 if ((void*)strtbl > elf->data_end) \
280 goto skip_this_shdr##B; \ 445 goto skip_this_shdr##B; \
446 /* let's flag -w/+x object files since the final ELF will most likely \
447 * need write access to the stack (who doesn't !?). so the combined \
448 * output will bring in +w automatically and that's bad. \
449 */ \
281 check_flags = SHF_WRITE|SHF_EXECINSTR; \ 450 check_flags = /*SHF_WRITE|*/SHF_EXECINSTR; \
282 for (i = 0; i < EGET(ehdr->e_shnum); ++i) { \ 451 for (i = 0; i < EGET(ehdr->e_shnum); ++i) { \
283 if (EGET(shdr[i].sh_type) != SHT_PROGBITS) continue; \ 452 if (EGET(shdr[i].sh_type) != SHT_PROGBITS) continue; \
284 offset = EGET(strtbl->sh_offset) + EGET(shdr[i].sh_name); \ 453 offset = EGET(strtbl->sh_offset) + EGET(shdr[i].sh_name); \
285 str = elf->data + offset; \ 454 if (offset >= elf->len - sizeof(NOTE_GNU_STACK)) \
286 if (str > elf->data + offset + sizeof(NOTE_GNU_STACK)) continue; \ 455 continue; \
287 if (!strcmp(str, NOTE_GNU_STACK)) { \ 456 if (!strcmp(elf->data + offset, NOTE_GNU_STACK)) { \
288 if (multi_stack++) warnf("%s: multiple .note.GNU-stack's !?", elf->filename); \ 457 if (multi_stack++) warnf("%s: multiple .note.GNU-stack's !?", elf->filename); \
289 flags = EGET(shdr[i].sh_flags); \ 458 flags = EGET(shdr[i].sh_flags); \
290 if (be_quiet && ((flags & check_flags) != check_flags)) \ 459 if (be_quiet && ((flags & check_flags) != check_flags)) \
291 continue; \ 460 continue; \
292 ++*found_phdr; \ 461 ++*found_phdr; \
463 else \ 632 else \
464 printf("%s", func_name); \ 633 printf("%s", func_name); \
465 } else \ 634 } else \
466 printf("(optimized out)"); \ 635 printf("(optimized out)"); \
467 printf(" [0x%lX]\n", (unsigned long)offset_tmp); \ 636 printf(" [0x%lX]\n", (unsigned long)offset_tmp); \
468 if (be_verbose && has_objdump) { \ 637 if (be_verbose && objdump) { \
469 Elf ## B ## _Addr end_addr = offset_tmp + EGET(func->st_size); \ 638 Elf ## B ## _Addr end_addr = offset_tmp + EGET(func->st_size); \
470 char *sysbuf; \ 639 char *sysbuf; \
471 size_t syslen; \ 640 size_t syslen; \
472 int sysret; \
473 const char sysfmt[] = "objdump -r -R -d -w -l --start-address=0x%lX --stop-address=0x%lX %s | grep --color -i -C 3 '.*[[:space:]]%lX:[[:space:]]*R_.*'\n"; \ 641 const char sysfmt[] = "%s -r -R -d -w -l --start-address=0x%lX --stop-address=0x%lX %s | grep --color -i -C 3 '.*[[:space:]]%lX:[[:space:]]*R_.*'\n"; \
474 syslen = sizeof(sysfmt) + strlen(elf->filename) + 3 * sizeof(unsigned long) + 1; \ 642 syslen = sizeof(sysfmt) + strlen(objdump) + strlen(elf->filename) + 3 * sizeof(unsigned long) + 1; \
475 sysbuf = xmalloc(syslen); \ 643 sysbuf = xmalloc(syslen); \
476 if (end_addr < r_offset) \ 644 if (end_addr < r_offset) \
477 /* not uncommon when things are optimized out */ \ 645 /* not uncommon when things are optimized out */ \
478 end_addr = r_offset + 0x100; \ 646 end_addr = r_offset + 0x100; \
479 snprintf(sysbuf, syslen, sysfmt, \ 647 snprintf(sysbuf, syslen, sysfmt, \
648 objdump, \
480 (unsigned long)offset_tmp, \ 649 (unsigned long)offset_tmp, \
481 (unsigned long)end_addr, \ 650 (unsigned long)end_addr, \
482 elf->filename, \ 651 elf->filename, \
483 (unsigned long)r_offset); \ 652 (unsigned long)r_offset); \
484 fflush(stdout); \ 653 fflush(stdout); \
485 sysret = system(sysbuf); \ 654 if (system(sysbuf)) {/* don't care */} \
486 fflush(stdout); \ 655 fflush(stdout); \
487 free(sysbuf); \ 656 free(sysbuf); \
488 } \ 657 } \
489 } \ 658 } \
490 } } 659 } }
517 break; 686 break;
518 default: 687 default:
519 warnf("Maybe? sec problem with %s='%s' in %s", dt_type, item, elf->filename); 688 warnf("Maybe? sec problem with %s='%s' in %s", dt_type, item, elf->filename);
520 break; 689 break;
521 } 690 }
691 if (fix_elf)
692 warnf("Note: RPATH has been automatically fixed, but this should be fixed in the package itself");
522} 693}
523static void scanelf_file_rpath(elfobj *elf, char *found_rpath, char **ret, size_t *ret_len) 694static void scanelf_file_rpath(elfobj *elf, char *found_rpath, char **ret, size_t *ret_len)
524{ 695{
525 unsigned long i; 696 unsigned long i;
526 char *rpath, *runpath, **r; 697 char *rpath, *runpath, **r;
663 xstrcat(ret, (runpath ? runpath : rpath), ret_len); 834 xstrcat(ret, (runpath ? runpath : rpath), ret_len);
664 else if (!be_quiet) 835 else if (!be_quiet)
665 xstrcat(ret, " - ", ret_len); 836 xstrcat(ret, " - ", ret_len);
666} 837}
667 838
839/* Defines can be seen in glibc's sysdeps/generic/ldconfig.h */
668#define LDSO_CACHE_MAGIC "ld.so-" 840#define LDSO_CACHE_MAGIC "ld.so-"
669#define LDSO_CACHE_MAGIC_LEN (sizeof LDSO_CACHE_MAGIC -1) 841#define LDSO_CACHE_MAGIC_LEN (sizeof LDSO_CACHE_MAGIC -1)
670#define LDSO_CACHE_VER "1.7.0" 842#define LDSO_CACHE_VER "1.7.0"
671#define LDSO_CACHE_VER_LEN (sizeof LDSO_CACHE_VER -1) 843#define LDSO_CACHE_VER_LEN (sizeof LDSO_CACHE_VER -1)
672#define FLAG_ANY -1 844#define FLAG_ANY -1
681#define FLAG_X8664_LIB64 0x0300 853#define FLAG_X8664_LIB64 0x0300
682#define FLAG_S390_LIB64 0x0400 854#define FLAG_S390_LIB64 0x0400
683#define FLAG_POWERPC_LIB64 0x0500 855#define FLAG_POWERPC_LIB64 0x0500
684#define FLAG_MIPS64_LIBN32 0x0600 856#define FLAG_MIPS64_LIBN32 0x0600
685#define FLAG_MIPS64_LIBN64 0x0700 857#define FLAG_MIPS64_LIBN64 0x0700
858#define FLAG_X8664_LIBX32 0x0800
859#define FLAG_ARM_LIBHF 0x0900
860#define FLAG_AARCH64_LIB64 0x0a00
686 861
687#if defined(__GLIBC__) || defined(__UCLIBC__) 862#if defined(__GLIBC__) || defined(__UCLIBC__)
688 863
689static char *lookup_cache_lib(elfobj *elf, char *fname) 864static char *lookup_cache_lib(elfobj *elf, const char *fname)
690{ 865{
691 int fd; 866 int fd;
692 char *strs; 867 char *strs;
693 static char buf[__PAX_UTILS_PATH_MAX] = ""; 868 static char buf[__PAX_UTILS_PATH_MAX] = "";
694 const char cachefile[] = "/etc/ld.so.cache"; 869 const char *cachefile = root_rel_path("/etc/ld.so.cache");
695 struct stat st; 870 struct stat st;
696 871
697 typedef struct { 872 typedef struct {
698 char magic[LDSO_CACHE_MAGIC_LEN]; 873 char magic[LDSO_CACHE_MAGIC_LEN];
699 char version[LDSO_CACHE_VER_LEN]; 874 char version[LDSO_CACHE_VER_LEN];
710 885
711 if (fname == NULL) 886 if (fname == NULL)
712 return NULL; 887 return NULL;
713 888
714 if (ldcache == NULL) { 889 if (ldcache == NULL) {
715 if (stat(cachefile, &st)) 890 if (fstatat(root_fd, cachefile, &st, 0))
716 return NULL; 891 return NULL;
717 892
718 fd = open(cachefile, O_RDONLY); 893 fd = openat(root_fd, cachefile, O_RDONLY);
719 if (fd == -1) 894 if (fd == -1)
720 return NULL; 895 return NULL;
721 896
722 /* cache these values so we only map/unmap the cache file once */ 897 /* cache these values so we only map/unmap the cache file once */
723 ldcache_size = st.st_size; 898 ldcache_size = st.st_size;
762 937
763 return buf; 938 return buf;
764} 939}
765 940
766#elif defined(__NetBSD__) 941#elif defined(__NetBSD__)
767static char *lookup_cache_lib(elfobj *elf, char *fname) 942static char *lookup_cache_lib(elfobj *elf, const char *fname)
768{ 943{
769 static char buf[__PAX_UTILS_PATH_MAX] = ""; 944 static char buf[__PAX_UTILS_PATH_MAX] = "";
770 static struct stat st; 945 static struct stat st;
771 size_t n; 946 size_t n;
772 char *ldpath; 947 char *ldpath;
791} 966}
792#else 967#else
793#ifdef __ELF__ 968#ifdef __ELF__
794#warning Cache support not implemented for your target 969#warning Cache support not implemented for your target
795#endif 970#endif
796static char *lookup_cache_lib(elfobj *elf, char *fname) 971static char *lookup_cache_lib(elfobj *elf, const char *fname)
797{ 972{
798 return NULL; 973 return NULL;
799} 974}
800#endif 975#endif
976
977static char *lookup_config_lib(const char *fname)
978{
979 static char buf[__PAX_UTILS_PATH_MAX] = "";
980 const char *ldpath;
981 size_t n;
982
983 array_for_each(ldpaths, n, ldpath) {
984 snprintf(buf, sizeof(buf), "%s/%s", root_rel_path(ldpath), fname);
985 if (faccessat(root_fd, buf, F_OK, AT_SYMLINK_NOFOLLOW) == 0)
986 return buf;
987 }
988
989 return NULL;
990}
801 991
802static const char *scanelf_file_needed_lib(elfobj *elf, char *found_needed, char *found_lib, int op, char **ret, size_t *ret_len) 992static const char *scanelf_file_needed_lib(elfobj *elf, char *found_needed, char *found_lib, int op, char **ret, size_t *ret_len)
803{ 993{
804 unsigned long i; 994 unsigned long i;
805 char *needed; 995 char *needed;
843 needed = elf->data + offset; \ 1033 needed = elf->data + offset; \
844 if (op == 0) { \ 1034 if (op == 0) { \
845 /* -n -> print all entries */ \ 1035 /* -n -> print all entries */ \
846 if (!be_wewy_wewy_quiet) { \ 1036 if (!be_wewy_wewy_quiet) { \
847 if (*found_needed) xchrcat(ret, ',', ret_len); \ 1037 if (*found_needed) xchrcat(ret, ',', ret_len); \
848 if (use_ldcache) \ 1038 if (use_ldpath) { \
1039 if ((p = lookup_config_lib(needed)) != NULL) \
1040 needed = p; \
1041 } else if (use_ldcache) { \
849 if ((p = lookup_cache_lib(elf, needed)) != NULL) \ 1042 if ((p = lookup_cache_lib(elf, needed)) != NULL) \
850 needed = p; \ 1043 needed = p; \
1044 } \
851 xstrcat(ret, needed, ret_len); \ 1045 xstrcat(ret, needed, ret_len); \
852 } \ 1046 } \
853 *found_needed = 1; \ 1047 *found_needed = 1; \
854 } else { \ 1048 } else { \
855 /* -N -> print matching entries */ \ 1049 /* -N -> print matching entries */ \
856 size_t n; \ 1050 size_t n; \
857 const char *find_lib_name; \ 1051 const char *find_lib_name; \
858 \ 1052 \
859 array_for_each(find_lib_arr, n, find_lib_name) \ 1053 array_for_each(find_lib_arr, n, find_lib_name) { \
1054 int invert = 1; \
1055 if (find_lib_name[0] == '!') \
1056 invert = 0, ++find_lib_name; \
860 if (!strcmp(find_lib_name, needed)) \ 1057 if (!strcmp(find_lib_name, needed) == invert) \
861 ++matched; \ 1058 ++matched; \
1059 } \
862 \ 1060 \
863 if (matched == array_cnt(find_lib_arr)) { \ 1061 if (matched == array_cnt(find_lib_arr)) { \
864 *found_lib = 1; \ 1062 *found_lib = 1; \
865 return (be_wewy_wewy_quiet ? NULL : find_lib); \ 1063 return (be_wewy_wewy_quiet ? NULL : find_lib); \
866 } \ 1064 } \
877 1075
878 return NULL; 1076 return NULL;
879} 1077}
880static char *scanelf_file_interp(elfobj *elf, char *found_interp) 1078static char *scanelf_file_interp(elfobj *elf, char *found_interp)
881{ 1079{
882 void *strtbl_void; 1080 uint64_t offset = 0;
883 1081
884 if (!show_interp) return NULL; 1082 if (!show_interp) return NULL;
885 1083
1084 if (elf->phdr) {
1085 /* Walk all the program headers to find the PT_INTERP */
1086#define SHOW_PT_INTERP(B) \
1087 if (elf->elf_class == ELFCLASS ## B) { \
1088 size_t i; \
1089 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
1090 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \
1091 for (i = 0; i < EGET(ehdr->e_phnum); ++i) { \
1092 if (EGET(phdr[i].p_type) == PT_INTERP) { \
1093 offset = EGET(phdr[i].p_offset); \
1094 break; \
1095 } \
1096 } \
1097 }
1098 SHOW_PT_INTERP(32)
1099 SHOW_PT_INTERP(64)
1100 } else if (elf->shdr) {
1101 /* Use the section headers to find it */
886 strtbl_void = elf_findsecbyname(elf, ".interp"); 1102 void *strtbl_void = elf_findsecbyname(elf, ".interp");
887 1103
888 if (strtbl_void) {
889#define SHOW_INTERP(B) \ 1104#define SHOW_INTERP(B) \
890 if (elf->elf_class == ELFCLASS ## B) { \ 1105 if (elf->elf_class == ELFCLASS ## B) { \
891 Elf ## B ## _Shdr *strtbl = SHDR ## B (strtbl_void); \ 1106 Elf ## B ## _Shdr *strtbl = SHDR ## B (strtbl_void); \
892 *found_interp = 1; \ 1107 offset = EGET(strtbl->sh_offset); \
893 return (be_wewy_wewy_quiet ? NULL : elf->data + EGET(strtbl->sh_offset)); \
894 } 1108 }
1109 if (strtbl_void) {
895 SHOW_INTERP(32) 1110 SHOW_INTERP(32)
896 SHOW_INTERP(64) 1111 SHOW_INTERP(64)
897 } 1112 }
1113 }
1114
1115 /* Validate the pointer even if we don't use it in output */
1116 if (offset && offset <= (uint64_t)elf->len) {
1117 char *interp = elf->data + offset;
1118
1119 /* If it isn't a C pointer, it's garbage */
1120 if (memchr(interp, 0, elf->len - offset)) {
1121 *found_interp = 1;
1122 if (!be_wewy_wewy_quiet)
1123 return interp;
1124 }
1125 }
1126
898 return NULL; 1127 return NULL;
899} 1128}
900static char *scanelf_file_bind(elfobj *elf, char *found_bind) 1129static const char *scanelf_file_bind(elfobj *elf, char *found_bind)
901{ 1130{
902 unsigned long i; 1131 unsigned long i;
903 struct stat s; 1132 struct stat s;
904 char dynamic = 0; 1133 bool dynamic = false;
905 1134
906 if (!show_bind) return NULL; 1135 if (!show_bind) return NULL;
907 if (!elf->phdr) return NULL; 1136 if (!elf->phdr) return NULL;
908 1137
909#define SHOW_BIND(B) \ 1138#define SHOW_BIND(B) \
912 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \ 1141 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
913 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \ 1142 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \
914 Elf ## B ## _Off offset; \ 1143 Elf ## B ## _Off offset; \
915 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \ 1144 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
916 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \ 1145 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \
917 dynamic = 1; \ 1146 dynamic = true; \
918 offset = EGET(phdr[i].p_offset); \ 1147 offset = EGET(phdr[i].p_offset); \
919 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \ 1148 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \
920 dyn = DYN ## B (elf->vdata + offset); \ 1149 dyn = DYN ## B (elf->vdata + offset); \
921 while (EGET(dyn->d_tag) != DT_NULL) { \ 1150 while (EGET(dyn->d_tag) != DT_NULL) { \
922 if (EGET(dyn->d_tag) == DT_BIND_NOW || \ 1151 if (EGET(dyn->d_tag) == DT_BIND_NOW || \
938 /* don't output anything if quiet mode and the ELF is static or not setuid */ 1167 /* don't output anything if quiet mode and the ELF is static or not setuid */
939 if (be_quiet && (!dynamic || (!fstat(elf->fd, &s) && !(s.st_mode & (S_ISUID|S_ISGID))))) { 1168 if (be_quiet && (!dynamic || (!fstat(elf->fd, &s) && !(s.st_mode & (S_ISUID|S_ISGID))))) {
940 return NULL; 1169 return NULL;
941 } else { 1170 } else {
942 *found_bind = 1; 1171 *found_bind = 1;
943 return (char *)(dynamic ? "LAZY" : "STATIC"); 1172 return dynamic ? "LAZY" : "STATIC";
944 } 1173 }
945} 1174}
946static char *scanelf_file_soname(elfobj *elf, char *found_soname) 1175static char *scanelf_file_soname(elfobj *elf, char *found_soname)
947{ 1176{
948 unsigned long i; 1177 unsigned long i;
1001 * defined symbols. If it's a minus ("-"), only match undefined symbols. 1230 * defined symbols. If it's a minus ("-"), only match undefined symbols.
1002 * Putting modifiers in between the percent signs allows for more in depth 1231 * Putting modifiers in between the percent signs allows for more in depth
1003 * filters. There are groups of modifiers. If you don't specify a member 1232 * filters. There are groups of modifiers. If you don't specify a member
1004 * of a group, then all types in that group are matched. The current 1233 * of a group, then all types in that group are matched. The current
1005 * groups and their types are: 1234 * groups and their types are:
1006 * STT group: STT_NOTYPE:n STT_OBJECT:o STT_FUNC:f SST_FILE:F 1235 * STT group: STT_NOTYPE:n STT_OBJECT:o STT_FUNC:f STT_FILE:F
1007 * STB group: STB_LOCAL:l STB_GLOBAL:g STB_WEAK:w 1236 * STB group: STB_LOCAL:l STB_GLOBAL:g STB_WEAK:w
1237 * STV group: STV_DEFAULT:p STV_INTERNAL:i STV_HIDDEN:h STV_PROTECTED:P
1008 * SHN group: SHN_UNDEF:u SHN_ABS:a SHN_COMMON:c {defined}:d 1238 * SHN group: SHN_UNDEF:u SHN_ABS:a SHN_COMMON:c {defined}:d
1009 * The "defined" value in the SHN group does not correspond to a SHN_xxx define. 1239 * The "defined" value in the SHN group does not correspond to a SHN_xxx define.
1010 * You can search for multiple symbols at once by seperating with a comma (","). 1240 * You can search for multiple symbols at once by seperating with a comma (",").
1011 * 1241 *
1012 * Some examples: 1242 * Some examples:
1021 * All global defined objects in an ELF: 1251 * All global defined objects in an ELF:
1022 * scanelf -s %ogd% <ELF> 1252 * scanelf -s %ogd% <ELF>
1023 */ 1253 */
1024static void 1254static void
1025scanelf_match_symname(elfobj *elf, char *found_sym, char **ret, size_t *ret_len, const char *symname, 1255scanelf_match_symname(elfobj *elf, char *found_sym, char **ret, size_t *ret_len, const char *symname,
1026 unsigned int stt, unsigned int stb, unsigned int shn, unsigned long size) 1256 unsigned int stt, unsigned int stb, unsigned int stv, unsigned int shn, unsigned long size)
1027{ 1257{
1028 char *this_sym, *next_sym, saved = saved; 1258 const char *this_sym;
1259 size_t n;
1029 1260
1030 /* allow the user to specify a comma delimited list of symbols to search for */ 1261 array_for_each(find_sym_arr, n, this_sym) {
1031 next_sym = NULL;
1032 do {
1033 bool inc_notype, inc_object, inc_func, inc_file, 1262 bool inc_notype, inc_object, inc_func, inc_file,
1034 inc_local, inc_global, inc_weak, 1263 inc_local, inc_global, inc_weak,
1264 inc_visdef, inc_intern, inc_hidden, inc_prot,
1035 inc_def, inc_undef, inc_abs, inc_common; 1265 inc_def, inc_undef, inc_abs, inc_common;
1036 1266
1037 if (next_sym) {
1038 next_sym[-1] = saved;
1039 this_sym = next_sym;
1040 } else
1041 this_sym = find_sym;
1042 if ((next_sym = strchr(this_sym, ','))) {
1043 /* make parsing easier by killing the comma temporarily */
1044 saved = *next_sym;
1045 *next_sym = '\0';
1046 next_sym += 1;
1047 }
1048
1049 /* symbol selection! */ 1267 /* symbol selection! */
1050 inc_notype = inc_object = inc_func = inc_file = \ 1268 inc_notype = inc_object = inc_func = inc_file =
1051 inc_local = inc_global = inc_weak = \ 1269 inc_local = inc_global = inc_weak =
1270 inc_visdef = inc_intern = inc_hidden = inc_prot =
1052 inc_def = inc_undef = inc_abs = inc_common = \ 1271 inc_def = inc_undef = inc_abs = inc_common =
1053 (*this_sym != '%'); 1272 (*this_sym != '%');
1054 1273
1055 /* parse the contents of %...% */ 1274 /* parse the contents of %...% */
1056 if (!inc_notype) { 1275 if (!inc_notype) {
1057 while (*(this_sym++)) { 1276 while (*(this_sym++)) {
1065 case 'f': inc_func = true; break; 1284 case 'f': inc_func = true; break;
1066 case 'F': inc_file = true; break; 1285 case 'F': inc_file = true; break;
1067 case 'l': inc_local = true; break; 1286 case 'l': inc_local = true; break;
1068 case 'g': inc_global = true; break; 1287 case 'g': inc_global = true; break;
1069 case 'w': inc_weak = true; break; 1288 case 'w': inc_weak = true; break;
1289 case 'p': inc_visdef = true; break;
1290 case 'i': inc_intern = true; break;
1291 case 'h': inc_hidden = true; break;
1292 case 'P': inc_prot = true; break;
1070 case 'd': inc_def = true; break; 1293 case 'd': inc_def = true; break;
1071 case 'u': inc_undef = true; break; 1294 case 'u': inc_undef = true; break;
1072 case 'a': inc_abs = true; break; 1295 case 'a': inc_abs = true; break;
1073 case 'c': inc_common = true; break; 1296 case 'c': inc_common = true; break;
1074 default: err("invalid symbol selector '%c'", *this_sym); 1297 default: err("invalid symbol selector '%c'", *this_sym);
1078 /* If no types are matched, not match all */ 1301 /* If no types are matched, not match all */
1079 if (!inc_notype && !inc_object && !inc_func && !inc_file) 1302 if (!inc_notype && !inc_object && !inc_func && !inc_file)
1080 inc_notype = inc_object = inc_func = inc_file = true; 1303 inc_notype = inc_object = inc_func = inc_file = true;
1081 if (!inc_local && !inc_global && !inc_weak) 1304 if (!inc_local && !inc_global && !inc_weak)
1082 inc_local = inc_global = inc_weak = true; 1305 inc_local = inc_global = inc_weak = true;
1306 if (!inc_visdef && !inc_intern && !inc_hidden && !inc_prot)
1307 inc_visdef = inc_intern = inc_hidden = inc_prot = true;
1083 if (!inc_def && !inc_undef && !inc_abs && !inc_common) 1308 if (!inc_def && !inc_undef && !inc_abs && !inc_common)
1084 inc_def = inc_undef = inc_abs = inc_common = true; 1309 inc_def = inc_undef = inc_abs = inc_common = true;
1085 1310
1086 /* backwards compat for defined/undefined short hand */ 1311 /* backwards compat for defined/undefined short hand */
1087 } else if (*this_sym == '+') { 1312 } else if (*this_sym == '+') {
1091 inc_def = inc_abs = inc_common = false; 1316 inc_def = inc_abs = inc_common = false;
1092 ++this_sym; 1317 ++this_sym;
1093 } 1318 }
1094 1319
1095 /* filter symbols */ 1320 /* filter symbols */
1096 if ((!inc_notype && stt == STT_NOTYPE) || \ 1321 if ((!inc_notype && stt == STT_NOTYPE ) || \
1097 (!inc_object && stt == STT_OBJECT) || \ 1322 (!inc_object && stt == STT_OBJECT ) || \
1098 (!inc_func && stt == STT_FUNC ) || \ 1323 (!inc_func && stt == STT_FUNC ) || \
1099 (!inc_file && stt == STT_FILE ) || \ 1324 (!inc_file && stt == STT_FILE ) || \
1100 (!inc_local && stb == STB_LOCAL ) || \ 1325 (!inc_local && stb == STB_LOCAL ) || \
1101 (!inc_global && stb == STB_GLOBAL) || \ 1326 (!inc_global && stb == STB_GLOBAL ) || \
1102 (!inc_weak && stb == STB_WEAK ) || \ 1327 (!inc_weak && stb == STB_WEAK ) || \
1328 (!inc_visdef && stv == STV_DEFAULT ) || \
1329 (!inc_intern && stv == STV_INTERNAL ) || \
1330 (!inc_hidden && stv == STV_HIDDEN ) || \
1331 (!inc_prot && stv == STV_PROTECTED) || \
1103 (!inc_def && shn && shn < SHN_LORESERVE) || \ 1332 (!inc_def && shn && shn < SHN_LORESERVE) || \
1104 (!inc_undef && shn == SHN_UNDEF ) || \ 1333 (!inc_undef && shn == SHN_UNDEF ) || \
1105 (!inc_abs && shn == SHN_ABS ) || \ 1334 (!inc_abs && shn == SHN_ABS ) || \
1106 (!inc_common && shn == SHN_COMMON)) 1335 (!inc_common && shn == SHN_COMMON ))
1107 continue; 1336 continue;
1108 1337
1109 if (*this_sym == '*') { 1338 if (*this_sym == '*') {
1110 /* a "*" symbol gets you debug output */ 1339 /* a "*" symbol gets you debug output */
1111 printf("%s(%s) %5lX %15s %15s %15s %s\n", 1340 printf("%s(%s) %5lX %-15s %-15s %-15s %-15s %s\n",
1112 ((*found_sym == 0) ? "\n\t" : "\t"), 1341 ((*found_sym == 0) ? "\n\t" : "\t"),
1113 elf->base_filename, 1342 elf->base_filename,
1114 size, 1343 size,
1115 get_elfstttype(stt), 1344 get_elfstttype(stt),
1116 get_elfstbtype(stb), 1345 get_elfstbtype(stb),
1346 get_elfstvtype(stv),
1117 get_elfshntype(shn), 1347 get_elfshntype(shn),
1118 symname); 1348 symname);
1119 goto matched; 1349 goto matched;
1120 1350
1121 } else { 1351 } else {
1122 if (g_match) { 1352 if (g_match) {
1123 /* regex match the symbol */ 1353 /* regex match the symbol */
1124 if (rematch(this_sym, symname, REG_EXTENDED) != 0) 1354 if (regexec(find_sym_regex_arr->eles[n], symname, 0, NULL, 0) == REG_NOMATCH)
1125 continue; 1355 continue;
1126 1356
1127 } else if (*this_sym) { 1357 } else if (*this_sym) {
1128 /* give empty symbols a "pass", else do a normal compare */ 1358 /* give empty symbols a "pass", else do a normal compare */
1129 const size_t len = strlen(this_sym); 1359 const size_t len = strlen(this_sym);
1145 xstrcat(ret, symname, ret_len); 1375 xstrcat(ret, symname, ret_len);
1146 } 1376 }
1147 1377
1148 goto matched; 1378 goto matched;
1149 } 1379 }
1150 } while (next_sym); 1380 }
1151 1381
1152 return; 1382 return;
1153 1383
1154 matched: 1384 matched:
1155 *found_sym = 1; 1385 *found_sym = 1;
1156 if (next_sym)
1157 next_sym[-1] = saved;
1158} 1386}
1159 1387
1160static const char *scanelf_file_sym(elfobj *elf, char *found_sym) 1388static const char *scanelf_file_sym(elfobj *elf, char *found_sym)
1161{ 1389{
1162 unsigned long i;
1163 char *ret; 1390 char *ret;
1164 void *symtab_void, *strtab_void; 1391 void *symtab_void, *strtab_void;
1165 1392
1166 if (!find_sym) return NULL; 1393 if (!find_sym) return NULL;
1167 ret = NULL; 1394 ret = NULL;
1172#define FIND_SYM(B) \ 1399#define FIND_SYM(B) \
1173 if (elf->elf_class == ELFCLASS ## B) { \ 1400 if (elf->elf_class == ELFCLASS ## B) { \
1174 Elf ## B ## _Shdr *symtab = SHDR ## B (symtab_void); \ 1401 Elf ## B ## _Shdr *symtab = SHDR ## B (symtab_void); \
1175 Elf ## B ## _Shdr *strtab = SHDR ## B (strtab_void); \ 1402 Elf ## B ## _Shdr *strtab = SHDR ## B (strtab_void); \
1176 Elf ## B ## _Sym *sym = SYM ## B (elf->vdata + EGET(symtab->sh_offset)); \ 1403 Elf ## B ## _Sym *sym = SYM ## B (elf->vdata + EGET(symtab->sh_offset)); \
1177 unsigned long cnt = EGET(symtab->sh_entsize); \ 1404 Elf ## B ## _Word i, cnt = EGET(symtab->sh_entsize); \
1178 char *symname; \ 1405 char *symname; \
1179 size_t ret_len = 0; \ 1406 size_t ret_len = 0; \
1407 if (!VALID_SHDR(elf, symtab) || !VALID_SHDR(elf, strtab)) \
1408 goto break_out; \
1180 if (cnt) \ 1409 if (cnt) \
1181 cnt = EGET(symtab->sh_size) / cnt; \ 1410 cnt = EGET(symtab->sh_size) / cnt; \
1182 for (i = 0; i < cnt; ++i) { \ 1411 for (i = 0; i < cnt; ++i) { \
1183 if ((void*)sym > elf->data_end) { \ 1412 if ((void*)sym > elf->data_end) { \
1184 warnf("%s: corrupt ELF symbols - aborting", elf->filename); \ 1413 warnf("%s: corrupt ELF symbols - aborting", elf->filename); \
1194 } \ 1423 } \
1195 scanelf_match_symname(elf, found_sym, \ 1424 scanelf_match_symname(elf, found_sym, \
1196 &ret, &ret_len, symname, \ 1425 &ret, &ret_len, symname, \
1197 ELF##B##_ST_TYPE(EGET(sym->st_info)), \ 1426 ELF##B##_ST_TYPE(EGET(sym->st_info)), \
1198 ELF##B##_ST_BIND(EGET(sym->st_info)), \ 1427 ELF##B##_ST_BIND(EGET(sym->st_info)), \
1428 ELF##B##_ST_VISIBILITY(EGET(sym->st_other)), \
1199 EGET(sym->st_shndx), \ 1429 EGET(sym->st_shndx), \
1200 /* st_size can be 64bit, but no one is really that big, so screw em */ \ 1430 /* st_size can be 64bit, but no one is really that big, so screw em */ \
1201 EGET(sym->st_size)); \ 1431 EGET(sym->st_size)); \
1202 } \ 1432 } \
1203 ++sym; \ 1433 ++sym; \
1204 } } 1434 } \
1435 }
1205 FIND_SYM(32) 1436 FIND_SYM(32)
1206 FIND_SYM(64) 1437 FIND_SYM(64)
1207 } 1438 }
1208 1439
1209break_out: 1440break_out:
1300 case 'x': prints(" PAX "); break; 1531 case 'x': prints(" PAX "); break;
1301 case 'e': prints("STK/REL/PTL "); break; 1532 case 'e': prints("STK/REL/PTL "); break;
1302 case 't': prints("TEXTREL "); break; 1533 case 't': prints("TEXTREL "); break;
1303 case 'r': prints("RPATH "); break; 1534 case 'r': prints("RPATH "); break;
1304 case 'M': prints("CLASS "); break; 1535 case 'M': prints("CLASS "); break;
1536 case 'l':
1305 case 'n': prints("NEEDED "); break; 1537 case 'n': prints("NEEDED "); break;
1306 case 'i': prints("INTERP "); break; 1538 case 'i': prints("INTERP "); break;
1307 case 'b': prints("BIND "); break; 1539 case 'b': prints("BIND "); break;
1308 case 'Z': prints("SIZE "); break; 1540 case 'Z': prints("SIZE "); break;
1309 case 'S': prints("SONAME "); break; 1541 case 'S': prints("SONAME "); break;
1414 1646
1415/* scan a single elf */ 1647/* scan a single elf */
1416static int scanelf_elf(const char *filename, int fd, size_t len) 1648static int scanelf_elf(const char *filename, int fd, size_t len)
1417{ 1649{
1418 int ret = 1; 1650 int ret = 1;
1651 size_t n;
1652 const char *match_etype;
1419 elfobj *elf; 1653 elfobj *elf;
1420 1654
1421 /* verify this is real ELF */ 1655 /* Verify this is a real ELF */
1422 if ((elf = _readelf_fd(filename, fd, len, !fix_elf)) == NULL) { 1656 if ((elf = _readelf_fd(filename, fd, len, !fix_elf)) == NULL) {
1423 if (be_verbose > 2) printf("%s: not an ELF\n", filename); 1657 if (be_verbose > 2) printf("%s: not an ELF\n", filename);
1424 return ret; 1658 return 2;
1425 } 1659 }
1660
1661 /* Possibly filter based on ELF bitness */
1426 switch (match_bits) { 1662 switch (match_bits) {
1427 case 32: 1663 case 32:
1428 if (elf->elf_class != ELFCLASS32) 1664 if (elf->elf_class != ELFCLASS32)
1429 goto label_done; 1665 goto done;
1430 break; 1666 break;
1431 case 64: 1667 case 64:
1432 if (elf->elf_class != ELFCLASS64) 1668 if (elf->elf_class != ELFCLASS64)
1433 goto label_done; 1669 goto done;
1434 break; 1670 break;
1435 default: break;
1436 } 1671 }
1437 if (match_etypes) { 1672
1438 char sbuf[126]; 1673 /* Possibly filter based on the ELF's e_type field */
1439 strncpy(sbuf, match_etypes, sizeof(sbuf)); 1674 array_for_each(match_etypes, n, match_etype)
1440 if (strchr(match_etypes, ',') != NULL) {
1441 char *p;
1442 while ((p = strrchr(sbuf, ',')) != NULL) {
1443 *p = 0;
1444 if (etype_lookup(p+1) == get_etype(elf)) 1675 if (etype_lookup(match_etype) == get_etype(elf))
1445 goto label_ret; 1676 goto scanit;
1446 } 1677 if (array_cnt(match_etypes))
1447 }
1448 if (etype_lookup(sbuf) != get_etype(elf))
1449 goto label_done; 1678 goto done;
1450 }
1451 1679
1452label_ret: 1680 scanit:
1453 ret = scanelf_elfobj(elf); 1681 ret = scanelf_elfobj(elf);
1454 1682
1455label_done: 1683 done:
1456 unreadelf(elf); 1684 unreadelf(elf);
1457 return ret; 1685 return ret;
1458} 1686}
1459 1687
1460/* scan an archive of elfs */ 1688/* scan an archive of elfs */
1483 munmap(ar_buffer, len); 1711 munmap(ar_buffer, len);
1484 1712
1485 return 0; 1713 return 0;
1486} 1714}
1487/* scan a file which may be an elf or an archive or some other magical beast */ 1715/* scan a file which may be an elf or an archive or some other magical beast */
1488static int scanelf_file(const char *filename, const struct stat *st_cache) 1716static int scanelf_fileat(int dir_fd, const char *filename, const struct stat *st_cache)
1489{ 1717{
1490 const struct stat *st = st_cache; 1718 const struct stat *st = st_cache;
1491 struct stat symlink_st; 1719 struct stat symlink_st;
1492 int fd; 1720 int fd;
1493 1721
1494 /* always handle regular files and handle symlinked files if no -y */ 1722 /* always handle regular files and handle symlinked files if no -y */
1495 if (S_ISLNK(st->st_mode)) { 1723 if (S_ISLNK(st->st_mode)) {
1496 if (!scan_symlink) return 1; 1724 if (!scan_symlink)
1725 return 1;
1497 stat(filename, &symlink_st); 1726 fstatat(dir_fd, filename, &symlink_st, 0);
1498 st = &symlink_st; 1727 st = &symlink_st;
1499 } 1728 }
1500 1729
1501 if (!S_ISREG(st->st_mode)) { 1730 if (!S_ISREG(st->st_mode)) {
1502 if (be_verbose > 2) printf("%s: skipping non-file\n", filename); 1731 if (be_verbose > 2) printf("%s: skipping non-file\n", filename);
1505 1734
1506 if (match_perms) { 1735 if (match_perms) {
1507 if ((st->st_mode | match_perms) != st->st_mode) 1736 if ((st->st_mode | match_perms) != st->st_mode)
1508 return 1; 1737 return 1;
1509 } 1738 }
1510 if ((fd=open(filename, (fix_elf ? O_RDWR : O_RDONLY))) == -1) 1739 fd = openat(dir_fd, filename, (fix_elf ? O_RDWR : O_RDONLY) | O_CLOEXEC);
1740 if (fd == -1) {
1741 if (fix_elf && errno == ETXTBSY)
1742 warnp("%s: could not fix", filename);
1743 else if (be_verbose > 2)
1744 printf("%s: skipping file: %s\n", filename, strerror(errno));
1511 return 1; 1745 return 1;
1746 }
1512 1747
1513 if (scanelf_elf(filename, fd, st->st_size) == 1 && scan_archives) 1748 if (scanelf_elf(filename, fd, st->st_size) == 2) {
1514 /* if it isn't an ELF, maybe it's an .a archive */ 1749 /* if it isn't an ELF, maybe it's an .a archive */
1750 if (scan_archives)
1515 scanelf_archive(filename, fd, st->st_size); 1751 scanelf_archive(filename, fd, st->st_size);
1516 1752
1753 /*
1754 * unreadelf() implicitly closes its fd, so only close it
1755 * when we are returning it in the non-ELF case
1756 */
1517 close(fd); 1757 close(fd);
1758 }
1759
1518 return 0; 1760 return 0;
1519} 1761}
1520 1762
1521static const char *maybe_add_root(const char *fname, char *buf)
1522{
1523 if (root && strncmp(fname, root, strlen(root))) {
1524 strcpy(buf, root);
1525 strncat(buf, fname, __PAX_UTILS_PATH_MAX - strlen(root) - 1);
1526 fname = buf;
1527 }
1528 return fname;
1529}
1530
1531/* scan a directory for ET_EXEC files and print when we find one */ 1763/* scan a directory for ET_EXEC files and print when we find one */
1532static int scanelf_dir(const char *path) 1764static int scanelf_dirat(int dir_fd, const char *path)
1533{ 1765{
1534 register DIR *dir; 1766 register DIR *dir;
1535 register struct dirent *dentry; 1767 register struct dirent *dentry;
1536 struct stat st_top, st; 1768 struct stat st_top, st;
1537 char buf[__PAX_UTILS_PATH_MAX]; 1769 char buf[__PAX_UTILS_PATH_MAX], *subpath;
1538 char _path[__PAX_UTILS_PATH_MAX];
1539 size_t pathlen = 0, len = 0; 1770 size_t pathlen = 0, len = 0;
1540 int ret = 0; 1771 int ret = 0;
1541 1772 int subdir_fd;
1542 path = maybe_add_root(path, _path);
1543 1773
1544 /* make sure path exists */ 1774 /* make sure path exists */
1545 if (lstat(path, &st_top) == -1) { 1775 if (fstatat(dir_fd, path, &st_top, AT_SYMLINK_NOFOLLOW) == -1) {
1546 if (be_verbose > 2) printf("%s: does not exist\n", path); 1776 if (be_verbose > 2) printf("%s: does not exist\n", path);
1547 return 1; 1777 return 1;
1548 } 1778 }
1549 1779
1550 /* ok, if it isn't a directory, assume we can open it */ 1780 /* ok, if it isn't a directory, assume we can open it */
1551 if (!S_ISDIR(st_top.st_mode)) { 1781 if (!S_ISDIR(st_top.st_mode))
1552 return scanelf_file(path, &st_top); 1782 return scanelf_fileat(dir_fd, path, &st_top);
1553 }
1554 1783
1555 /* now scan the dir looking for fun stuff */ 1784 /* now scan the dir looking for fun stuff */
1556 if ((dir = opendir(path)) == NULL) { 1785 subdir_fd = openat(dir_fd, path, O_RDONLY|O_CLOEXEC);
1557 warnf("could not opendir %s: %s", path, strerror(errno)); 1786 if (subdir_fd == -1)
1787 dir = NULL;
1788 else
1789 dir = fdopendir(subdir_fd);
1790 if (dir == NULL) {
1791 if (subdir_fd != -1)
1792 close(subdir_fd);
1793 else if (be_verbose > 2)
1794 printf("%s: skipping dir: %s\n", path, strerror(errno));
1558 return 1; 1795 return 1;
1559 } 1796 }
1560 if (be_verbose > 1) printf("%s: scanning dir\n", path); 1797 if (be_verbose > 1) printf("%s: scanning dir\n", path);
1561 1798
1562 pathlen = strlen(path); 1799 subpath = stpcpy(buf, path);
1800 if (subpath[-1] != '/')
1801 *subpath++ = '/';
1802 pathlen = subpath - buf;
1563 while ((dentry = readdir(dir))) { 1803 while ((dentry = readdir(dir))) {
1564 if (!strcmp(dentry->d_name, ".") || !strcmp(dentry->d_name, "..")) 1804 if (!strcmp(dentry->d_name, ".") || !strcmp(dentry->d_name, ".."))
1565 continue; 1805 continue;
1806
1807 if (fstatat(subdir_fd, dentry->d_name, &st, AT_SYMLINK_NOFOLLOW) == -1)
1808 continue;
1809
1566 len = (pathlen + 1 + strlen(dentry->d_name) + 1); 1810 len = strlen(dentry->d_name);
1567 if (len >= sizeof(buf)) { 1811 if (len + pathlen + 1 >= sizeof(buf)) {
1568 warnf("Skipping '%s': len > sizeof(buf); %lu > %lu\n", path, 1812 warnf("Skipping '%s%s': len > sizeof(buf); %zu > %zu\n",
1569 (unsigned long)len, (unsigned long)sizeof(buf)); 1813 path, dentry->d_name, len + pathlen + 1, sizeof(buf));
1570 continue; 1814 continue;
1571 } 1815 }
1572 snprintf(buf, sizeof(buf), "%s%s%s", path, (path[pathlen-1] == '/') ? "" : "/", dentry->d_name); 1816 memcpy(subpath, dentry->d_name, len);
1573 if (lstat(buf, &st) != -1) { 1817 subpath[len] = '\0';
1818
1574 if (S_ISREG(st.st_mode)) 1819 if (S_ISREG(st.st_mode))
1575 ret = scanelf_file(buf, &st); 1820 ret = scanelf_fileat(dir_fd, buf, &st);
1576 else if (dir_recurse && S_ISDIR(st.st_mode)) { 1821 else if (dir_recurse && S_ISDIR(st.st_mode)) {
1577 if (dir_crossmount || (st_top.st_dev == st.st_dev)) 1822 if (dir_crossmount || (st_top.st_dev == st.st_dev))
1578 ret = scanelf_dir(buf); 1823 ret = scanelf_dirat(dir_fd, buf);
1579 }
1580 } 1824 }
1581 } 1825 }
1582 closedir(dir); 1826 closedir(dir);
1827
1583 return ret; 1828 return ret;
1584} 1829}
1830static int scanelf_dir(const char *path)
1831{
1832 return scanelf_dirat(root_fd, root_rel_path(path));
1833}
1585 1834
1586static int scanelf_from_file(const char *filename) 1835static int scanelf_from_file(const char *filename)
1587{ 1836{
1588 FILE *fp = NULL; 1837 FILE *fp;
1589 char *p; 1838 char *p, *path;
1590 char path[__PAX_UTILS_PATH_MAX]; 1839 size_t len;
1591 int ret = 0; 1840 int ret;
1592 1841
1593 if (strcmp(filename, "-") == 0) 1842 if (strcmp(filename, "-") == 0)
1594 fp = stdin; 1843 fp = stdin;
1595 else if ((fp = fopen(filename, "r")) == NULL) 1844 else if ((fp = fopen(filename, "r")) == NULL)
1596 return 1; 1845 return 1;
1597 1846
1598 while ((fgets(path, __PAX_UTILS_PATH_MAX, fp)) != NULL) { 1847 path = NULL;
1848 len = 0;
1849 ret = 0;
1850 while (getline(&path, &len, fp) != -1) {
1599 if ((p = strchr(path, '\n')) != NULL) 1851 if ((p = strchr(path, '\n')) != NULL)
1600 *p = 0; 1852 *p = 0;
1601 search_path = path; 1853 search_path = path;
1602 ret = scanelf_dir(path); 1854 ret = scanelf_dir(path);
1603 } 1855 }
1856 free(path);
1857
1604 if (fp != stdin) 1858 if (fp != stdin)
1605 fclose(fp); 1859 fclose(fp);
1860
1606 return ret; 1861 return ret;
1607} 1862}
1608 1863
1609#if defined(__GLIBC__) || defined(__UCLIBC__) || defined(__NetBSD__) 1864#if defined(__GLIBC__) || defined(__UCLIBC__) || defined(__NetBSD__)
1610 1865
1611static int load_ld_cache_config(int i, const char *fname) 1866static int _load_ld_cache_config(const char *fname)
1612{ 1867{
1613 FILE *fp = NULL; 1868 FILE *fp = NULL;
1614 char *p; 1869 char *p, *path;
1615 char path[__PAX_UTILS_PATH_MAX]; 1870 size_t len;
1616 char _fname[__PAX_UTILS_PATH_MAX]; 1871 int curr_fd = -1;
1617 1872
1618 fname = maybe_add_root(fname, _fname); 1873 fp = fopenat_r(root_fd, root_rel_path(fname));
1619 1874 if (fp == NULL)
1620 if ((fp = fopen(fname, "r")) == NULL)
1621 return i; 1875 return -1;
1622 1876
1623 while ((fgets(path, __PAX_UTILS_PATH_MAX, fp)) != NULL) { 1877 path = NULL;
1878 len = 0;
1879 while (getline(&path, &len, fp) != -1) {
1624 if ((p = strrchr(path, '\r')) != NULL) 1880 if ((p = strrchr(path, '\r')) != NULL)
1625 *p = 0; 1881 *p = 0;
1626 if ((p = strchr(path, '\n')) != NULL) 1882 if ((p = strchr(path, '\n')) != NULL)
1627 *p = 0; 1883 *p = 0;
1628 1884
1629 /* recursive includes of the same file will make this segfault. */ 1885 /* recursive includes of the same file will make this segfault. */
1630 if ((memcmp(path, "include", 7) == 0) && isblank(path[7])) { 1886 if ((memcmp(path, "include", 7) == 0) && isblank(path[7])) {
1631 glob_t gl; 1887 glob_t gl;
1632 size_t x; 1888 size_t x;
1633 char gpath[__PAX_UTILS_PATH_MAX]; 1889 const char *gpath;
1634 1890
1635 memset(gpath, 0, sizeof(gpath)); 1891 /* re-use existing path buffer ... need to be creative */
1636 if (root)
1637 strcpy(gpath, root);
1638
1639 if (path[8] != '/') 1892 if (path[8] != '/')
1640 snprintf(gpath+strlen(gpath), sizeof(gpath)-strlen(gpath), "/etc/%s", &path[8]); 1893 gpath = memcpy(path + 3, "/etc/", 5);
1641 else 1894 else
1642 strncpy(gpath+strlen(gpath), &path[8], sizeof(gpath)-strlen(gpath)); 1895 gpath = path + 8;
1896 if (root_fd != AT_FDCWD) {
1897 if (curr_fd == -1) {
1898 curr_fd = open(".", O_RDONLY|O_CLOEXEC);
1899 if (fchdir(root_fd))
1900 errp("unable to change to root dir");
1901 }
1902 gpath = root_rel_path(gpath);
1903 }
1643 1904
1644 if (glob(gpath, 0, NULL, &gl) == 0) { 1905 if (glob(gpath, 0, NULL, &gl) == 0) {
1645 for (x = 0; x < gl.gl_pathc; ++x) { 1906 for (x = 0; x < gl.gl_pathc; ++x) {
1646 /* try to avoid direct loops */ 1907 /* try to avoid direct loops */
1647 if (strcmp(gl.gl_pathv[x], fname) == 0) 1908 if (strcmp(gl.gl_pathv[x], fname) == 0)
1648 continue; 1909 continue;
1649 i = load_ld_cache_config(i, gl.gl_pathv[x]); 1910 _load_ld_cache_config(gl.gl_pathv[x]);
1650 } 1911 }
1651 globfree(&gl); 1912 globfree(&gl);
1652 continue;
1653 } 1913 }
1914
1915 /* failed globs are ignored by glibc */
1916 continue;
1654 } 1917 }
1655 1918
1656 if (*path != '/') 1919 if (*path != '/')
1657 continue; 1920 continue;
1658 1921
1659 xarraypush(ldpaths, path, strlen(path)); 1922 xarraypush_str(ldpaths, path);
1660 } 1923 }
1924 free(path);
1661 1925
1662 fclose(fp); 1926 fclose(fp);
1927
1928 if (curr_fd != -1) {
1929 if (fchdir(curr_fd))
1930 {/* don't care */}
1931 close(curr_fd);
1932 }
1933
1663 return i; 1934 return 0;
1664} 1935}
1665 1936
1666#elif defined(__FreeBSD__) || defined(__DragonFly__) 1937#elif defined(__FreeBSD__) || defined(__DragonFly__)
1667 1938
1668static int load_ld_cache_config(int i, const char *fname) 1939static int _load_ld_cache_config(const char *fname)
1669{ 1940{
1670 FILE *fp = NULL; 1941 FILE *fp = NULL;
1671 char *b = NULL, *p; 1942 char *b = NULL, *p;
1672 struct elfhints_hdr hdr; 1943 struct elfhints_hdr hdr;
1673 char _fname[__PAX_UTILS_PATH_MAX];
1674 1944
1675 fname = maybe_add_root(fname, _fname); 1945 fp = fopenat_r(root_fd, root_rel_path(fname));
1676 1946 if (fp == NULL)
1677 if ((fp = fopen(fname, "r")) == NULL)
1678 return i; 1947 return -1;
1679 1948
1680 if (fread(&hdr, 1, sizeof(hdr), fp) != sizeof(hdr) || 1949 if (fread(&hdr, 1, sizeof(hdr), fp) != sizeof(hdr) ||
1681 hdr.magic != ELFHINTS_MAGIC || hdr.version != 1 || 1950 hdr.magic != ELFHINTS_MAGIC || hdr.version != 1 ||
1682 fseek(fp, hdr.strtab + hdr.dirlist, SEEK_SET) == -1) 1951 fseek(fp, hdr.strtab + hdr.dirlist, SEEK_SET) == -1)
1683 { 1952 {
1684 fclose(fp); 1953 fclose(fp);
1685 return i; 1954 return -1;
1686 } 1955 }
1687 1956
1688 b = xmalloc(hdr.dirlistlen + 1); 1957 b = xmalloc(hdr.dirlistlen + 1);
1689 if (fread(b, 1, hdr.dirlistlen+1, fp) != hdr.dirlistlen+1) { 1958 if (fread(b, 1, hdr.dirlistlen+1, fp) != hdr.dirlistlen+1) {
1690 fclose(fp); 1959 fclose(fp);
1691 free(b); 1960 free(b);
1692 return i; 1961 return -1;
1693 } 1962 }
1694 1963
1695 while ((p = strsep(&b, ":"))) { 1964 while ((p = strsep(&b, ":"))) {
1696 if (*p == '\0') 1965 if (*p == '\0')
1697 continue; 1966 continue;
1698 xarraypush(ldpaths, p, strlen(p)); 1967 xarraypush_str(ldpaths, p);
1699 } 1968 }
1700 1969
1701 free(b); 1970 free(b);
1702 fclose(fp); 1971 fclose(fp);
1703 return i; 1972 return 0;
1704} 1973}
1705 1974
1706#else 1975#else
1707#ifdef __ELF__ 1976#ifdef __ELF__
1708#warning Cache config support not implemented for your target 1977#warning Cache config support not implemented for your target
1709#endif 1978#endif
1710static int load_ld_cache_config(int i, const char *fname) 1979static int _load_ld_cache_config(const char *fname)
1711{ 1980{
1712 return 0; 1981 return 0;
1713} 1982}
1714#endif 1983#endif
1984
1985static void load_ld_cache_config(const char *fname)
1986{
1987 bool scan_l, scan_ul, scan_ull;
1988 size_t n;
1989 const char *ldpath;
1990
1991 _load_ld_cache_config(fname);
1992
1993 scan_l = scan_ul = scan_ull = false;
1994 array_for_each(ldpaths, n, ldpath) {
1995 if (!scan_l && !strcmp(ldpath, "/lib")) scan_l = true;
1996 if (!scan_ul && !strcmp(ldpath, "/usr/lib")) scan_ul = true;
1997 if (!scan_ull && !strcmp(ldpath, "/usr/local/lib")) scan_ull = true;
1998 }
1999
2000 if (!scan_l) xarraypush_str(ldpaths, "/lib");
2001 if (!scan_ul) xarraypush_str(ldpaths, "/usr/lib");
2002 if (!scan_ull) xarraypush_str(ldpaths, "/usr/local/lib");
2003}
1715 2004
1716/* scan /etc/ld.so.conf for paths */ 2005/* scan /etc/ld.so.conf for paths */
1717static void scanelf_ldpath(void) 2006static void scanelf_ldpath(void)
1718{ 2007{
1719 char scan_l, scan_ul, scan_ull;
1720 size_t n; 2008 size_t n;
1721 const char *ldpath; 2009 const char *ldpath;
1722 int i = 0;
1723 2010
1724 if (array_cnt(ldpaths) == 0)
1725 err("Unable to load any paths from ld.so.conf");
1726
1727 scan_l = scan_ul = scan_ull = 0;
1728
1729 array_for_each(ldpaths, n, ldpath) { 2011 array_for_each(ldpaths, n, ldpath)
1730 if (!scan_l && !strcmp(ldpath, "/lib")) scan_l = 1;
1731 if (!scan_ul && !strcmp(ldpath, "/usr/lib")) scan_ul = 1;
1732 if (!scan_ull && !strcmp(ldpath, "/usr/local/lib")) scan_ull = 1;
1733 scanelf_dir(ldpath); 2012 scanelf_dir(ldpath);
1734 ++i;
1735 }
1736
1737 if (!scan_l) scanelf_dir("/lib");
1738 if (!scan_ul) scanelf_dir("/usr/lib");
1739 if (!scan_ull) scanelf_dir("/usr/local/lib");
1740} 2013}
1741 2014
1742/* scan env PATH for paths */ 2015/* scan env PATH for paths */
1743static void scanelf_envpath(void) 2016static void scanelf_envpath(void)
1744{ 2017{
1761#define PARSE_FLAGS "plRmyAXz:xetrnLibSs:k:gN:TaqvF:f:o:E:M:DIYO:ZCBhV" 2034#define PARSE_FLAGS "plRmyAXz:xetrnLibSs:k:gN:TaqvF:f:o:E:M:DIYO:ZCBhV"
1762#define a_argument required_argument 2035#define a_argument required_argument
1763static struct option const long_opts[] = { 2036static struct option const long_opts[] = {
1764 {"path", no_argument, NULL, 'p'}, 2037 {"path", no_argument, NULL, 'p'},
1765 {"ldpath", no_argument, NULL, 'l'}, 2038 {"ldpath", no_argument, NULL, 'l'},
2039 {"use-ldpath",no_argument, NULL, 129},
1766 {"root", a_argument, NULL, 128}, 2040 {"root", a_argument, NULL, 128},
1767 {"recursive", no_argument, NULL, 'R'}, 2041 {"recursive", no_argument, NULL, 'R'},
1768 {"mount", no_argument, NULL, 'm'}, 2042 {"mount", no_argument, NULL, 'm'},
1769 {"symlink", no_argument, NULL, 'y'}, 2043 {"symlink", no_argument, NULL, 'y'},
1770 {"archives", no_argument, NULL, 'A'}, 2044 {"archives", no_argument, NULL, 'A'},
1805}; 2079};
1806 2080
1807static const char * const opts_help[] = { 2081static const char * const opts_help[] = {
1808 "Scan all directories in PATH environment", 2082 "Scan all directories in PATH environment",
1809 "Scan all directories in /etc/ld.so.conf", 2083 "Scan all directories in /etc/ld.so.conf",
2084 "Use ld.so.conf to show full path (use with -r/-n)",
1810 "Root directory (use with -l or -p)", 2085 "Root directory (use with -l or -p)",
1811 "Scan directories recursively", 2086 "Scan directories recursively",
1812 "Don't recursively cross mount points", 2087 "Don't recursively cross mount points",
1813 "Don't scan symlinks", 2088 "Don't scan symlinks",
1814 "Scan archives (.a files)", 2089 "Scan archives (.a files)",
1815 "Utilize ld.so.cache information (use with -r/-n)", 2090 "Utilize ld.so.cache to show full path (use with -r/-n)",
1816 "Try and 'fix' bad things (use with -r/-e)", 2091 "Try and 'fix' bad things (use with -r/-e)",
1817 "Sets EI_PAX/PT_PAX_FLAGS to <arg> (use with -Xx)\n", 2092 "Sets EI_PAX/PT_PAX_FLAGS to <arg> (use with -Xx)\n",
1818 "Print PaX markings", 2093 "Print PaX markings",
1819 "Print GNU_STACK/PT_LOAD markings", 2094 "Print GNU_STACK/PT_LOAD markings",
1820 "Print TEXTREL information", 2095 "Print TEXTREL information",
1824 "Print BIND information", 2099 "Print BIND information",
1825 "Print SONAME information", 2100 "Print SONAME information",
1826 "Find a specified symbol", 2101 "Find a specified symbol",
1827 "Find a specified section", 2102 "Find a specified section",
1828 "Find a specified library", 2103 "Find a specified library",
1829 "Use regex matching rather than string compare (use with -s)", 2104 "Use regex rather than string compare (with -s); specify twice for case insensitive",
1830 "Locate cause of TEXTREL", 2105 "Locate cause of TEXTREL",
1831 "Print only ELF files matching etype ET_DYN,ET_EXEC ...", 2106 "Print only ELF files matching etype ET_DYN,ET_EXEC ...",
1832 "Print only ELF files matching numeric bits", 2107 "Print only ELF files matching numeric bits",
1833 "Print Endianness", 2108 "Print Endianness",
1834 "Print OSABI", 2109 "Print OSABI",
1849}; 2124};
1850 2125
1851/* display usage and exit */ 2126/* display usage and exit */
1852static void usage(int status) 2127static void usage(int status)
1853{ 2128{
1854 unsigned long i; 2129 const char a_arg[] = "<arg>";
2130 size_t a_arg_len = strlen(a_arg) + 2;
2131 size_t i;
2132 int optlen;
1855 printf("* Scan ELF binaries for stuff\n\n" 2133 printf("* Scan ELF binaries for stuff\n\n"
1856 "Usage: %s [options] <dir1/file1> [dir2 dirN file2 fileN ...]\n\n", argv0); 2134 "Usage: %s [options] <dir1/file1> [dir2 dirN file2 fileN ...]\n\n", argv0);
1857 printf("Options: -[%s]\n", PARSE_FLAGS); 2135 printf("Options: -[%s]\n", PARSE_FLAGS);
2136
2137 /* prescan the --long opt length to auto-align */
2138 optlen = 0;
1858 for (i = 0; long_opts[i].name; ++i) 2139 for (i = 0; long_opts[i].name; ++i) {
2140 int l = strlen(long_opts[i].name);
2141 if (long_opts[i].has_arg == a_argument)
2142 l += a_arg_len;
2143 optlen = max(l, optlen);
2144 }
2145
2146 for (i = 0; long_opts[i].name; ++i) {
2147 /* first output the short flag if it has one */
2148 if (long_opts[i].val > '~')
2149 printf(" ");
2150 else
2151 printf(" -%c, ", long_opts[i].val);
2152
2153 /* then the long flag */
1859 if (long_opts[i].has_arg == no_argument) 2154 if (long_opts[i].has_arg == no_argument)
1860 printf(" -%c, --%-14s* %s\n", long_opts[i].val, 2155 printf("--%-*s", optlen, long_opts[i].name);
1861 long_opts[i].name, opts_help[i]);
1862 else if (long_opts[i].val > '~')
1863 printf(" --%-7s <arg> * %s\n",
1864 long_opts[i].name, opts_help[i]);
1865 else 2156 else
1866 printf(" -%c, --%-7s <arg> * %s\n", long_opts[i].val, 2157 printf("--%s %s %*s", long_opts[i].name, a_arg,
1867 long_opts[i].name, opts_help[i]); 2158 (int)(optlen - strlen(long_opts[i].name) - a_arg_len), "");
2159
2160 /* finally the help text */
2161 printf("* %s\n", opts_help[i]);
2162 }
1868 2163
1869 puts("\nFor more information, see the scanelf(1) manpage"); 2164 puts("\nFor more information, see the scanelf(1) manpage");
1870 exit(status); 2165 exit(status);
1871} 2166}
1872 2167
1877 flags |= PF_NO##flag; \ 2172 flags |= PF_NO##flag; \
1878 } else { \ 2173 } else { \
1879 flags &= ~PF_NO##flag; \ 2174 flags &= ~PF_NO##flag; \
1880 flags |= PF_##flag; \ 2175 flags |= PF_##flag; \
1881 } 2176 }
2177static void parse_delimited(array_t *arr, char *arg, const char *delim)
2178{
2179 char *ele = strtok(arg, delim);
2180 if (!ele) /* edge case: -s '' */
2181 xarraypush_str(arr, "");
2182 while (ele) {
2183 xarraypush_str(arr, ele);
2184 ele = strtok(NULL, delim);
2185 }
2186}
1882static int parseargs(int argc, char *argv[]) 2187static int parseargs(int argc, char *argv[])
1883{ 2188{
1884 int i; 2189 int i;
1885 const char *from_file = NULL; 2190 const char *from_file = NULL;
1886 int ret = 0; 2191 int ret = 0;
2192 char load_cache_config = 0;
1887 2193
1888 opterr = 0; 2194 opterr = 0;
1889 while ((i=getopt_long(argc, argv, PARSE_FLAGS, long_opts, NULL)) != -1) { 2195 while ((i=getopt_long(argc, argv, PARSE_FLAGS, long_opts, NULL)) != -1) {
1890 switch (i) { 2196 switch (i) {
1891 2197
1892 case 'V': 2198 case 'V':
1893 printf("pax-utils-%s: %s compiled %s\n%s\n" 2199 printf("pax-utils-%s: %s\n%s\n"
1894 "%s written for Gentoo by <solar and vapier @ gentoo.org>\n", 2200 "%s written for Gentoo by <solar and vapier @ gentoo.org>\n",
1895 VERSION, __FILE__, __DATE__, rcsid, argv0); 2201 VERSION, __FILE__, rcsid, argv0);
1896 exit(EXIT_SUCCESS); 2202 exit(EXIT_SUCCESS);
1897 break; 2203 break;
1898 case 'h': usage(EXIT_SUCCESS); break; 2204 case 'h': usage(EXIT_SUCCESS); break;
1899 case 'f': 2205 case 'f':
1900 if (from_file) warn("You prob don't want to specify -f twice"); 2206 if (from_file) warn("You prob don't want to specify -f twice");
1901 from_file = optarg; 2207 from_file = optarg;
1902 break; 2208 break;
1903 case 'E': 2209 case 'E':
1904 match_etypes = optarg; 2210 /* historically, this was comma delimited */
2211 parse_delimited(match_etypes, optarg, ",");
1905 break; 2212 break;
1906 case 'M': 2213 case 'M':
1907 match_bits = atoi(optarg); 2214 match_bits = atoi(optarg);
1908 if (match_bits == 0) { 2215 if (match_bits == 0) {
1909 if (strcmp(optarg, "ELFCLASS32") == 0) 2216 if (strcmp(optarg, "ELFCLASS32") == 0)
1916 if (sscanf(optarg, "%o", &match_perms) == -1) 2223 if (sscanf(optarg, "%o", &match_perms) == -1)
1917 match_bits = 0; 2224 match_bits = 0;
1918 break; 2225 break;
1919 case 'o': { 2226 case 'o': {
1920 if (freopen(optarg, "w", stdout) == NULL) 2227 if (freopen(optarg, "w", stdout) == NULL)
1921 err("Could not open output stream '%s': %s", optarg, strerror(errno)); 2228 errp("Could not freopen(%s)", optarg);
1922 break; 2229 break;
1923 } 2230 }
1924 case 'k': 2231 case 'k':
1925 xarraypush(find_section_arr, optarg, strlen(optarg)); 2232 xarraypush_str(find_section_arr, optarg);
1926 break; 2233 break;
1927 case 's': { 2234 case 's':
1928 if (find_sym) warn("You prob don't want to specify -s twice"); 2235 /* historically, this was comma delimited */
1929 find_sym = optarg; 2236 parse_delimited(find_sym_arr, optarg, ",");
1930 break; 2237 break;
1931 }
1932 case 'N': 2238 case 'N':
1933 xarraypush(find_lib_arr, optarg, strlen(optarg)); 2239 xarraypush_str(find_lib_arr, optarg);
1934 break; 2240 break;
1935 case 'F': { 2241 case 'F': {
1936 if (out_format) warn("You prob don't want to specify -F twice"); 2242 if (out_format) warn("You prob don't want to specify -F twice");
1937 out_format = optarg; 2243 out_format = optarg;
1938 break; 2244 break;
1979 ((flags & PF_RANDMMAP) && (flags & PF_NORANDMMAP)))) 2285 ((flags & PF_RANDMMAP) && (flags & PF_NORANDMMAP))))
1980 setpax = flags; 2286 setpax = flags;
1981 break; 2287 break;
1982 } 2288 }
1983 case 'Z': show_size = 1; break; 2289 case 'Z': show_size = 1; break;
1984 case 'g': g_match = 1; break; 2290 case 'g': ++g_match; break;
1985 case 'L': use_ldcache = 1; break; 2291 case 'L': load_cache_config = use_ldcache = 1; break;
1986 case 'y': scan_symlink = 0; break; 2292 case 'y': scan_symlink = 0; break;
1987 case 'A': scan_archives = 1; break; 2293 case 'A': scan_archives = 1; break;
1988 case 'C': color_init(true); break; 2294 case 'C': color_init(true); break;
1989 case 'B': show_banner = 0; break; 2295 case 'B': show_banner = 0; break;
1990 case 'l': scan_ldpath = 1; break; 2296 case 'l': load_cache_config = scan_ldpath = 1; break;
1991 case 'p': scan_envpath = 1; break; 2297 case 'p': scan_envpath = 1; break;
1992 case 'R': dir_recurse = 1; break; 2298 case 'R': dir_recurse = 1; break;
1993 case 'm': dir_crossmount = 0; break; 2299 case 'm': dir_crossmount = 0; break;
1994 case 'X': ++fix_elf; break; 2300 case 'X': ++fix_elf; break;
1995 case 'x': show_pax = 1; break; 2301 case 'x': show_pax = 1; break;
1999 case 'n': show_needed = 1; break; 2305 case 'n': show_needed = 1; break;
2000 case 'i': show_interp = 1; break; 2306 case 'i': show_interp = 1; break;
2001 case 'b': show_bind = 1; break; 2307 case 'b': show_bind = 1; break;
2002 case 'S': show_soname = 1; break; 2308 case 'S': show_soname = 1; break;
2003 case 'T': show_textrels = 1; break; 2309 case 'T': show_textrels = 1; break;
2004 case 'q': be_quiet = 1; break; 2310 case 'q': be_quiet = min(be_quiet, 20) + 1; break;
2005 case 'v': be_verbose = (be_verbose % 20) + 1; break; 2311 case 'v': be_verbose = min(be_verbose, 20) + 1; break;
2006 case 'a': show_perms = show_pax = show_phdr = show_textrel = show_rpath = show_bind = show_endian = 1; break; 2312 case 'a': show_perms = show_pax = show_phdr = show_textrel = show_rpath = show_bind = show_endian = 1; break;
2007 case 'D': show_endian = 1; break; 2313 case 'D': show_endian = 1; break;
2008 case 'I': show_osabi = 1; break; 2314 case 'I': show_osabi = 1; break;
2009 case 'Y': show_eabi = 1; break; 2315 case 'Y': show_eabi = 1; break;
2010 case 128: 2316 case 128:
2011 root = optarg; 2317 root_fd = open(optarg, O_RDONLY|O_CLOEXEC);
2318 if (root_fd == -1)
2319 err("Could not open root: %s", optarg);
2012 break; 2320 break;
2321 case 129: load_cache_config = use_ldpath = 1; break;
2013 case ':': 2322 case ':':
2014 err("Option '%c' is missing parameter", optopt); 2323 err("Option '%c' is missing parameter", optopt);
2015 case '?': 2324 case '?':
2016 err("Unknown option '%c' or argument missing", optopt); 2325 err("Unknown option '%c' or argument missing", optopt);
2017 default: 2326 default:
2018 err("Unhandled option '%c'; please report this", i); 2327 err("Unhandled option '%c'; please report this", i);
2019 } 2328 }
2020 } 2329 }
2021 if (show_textrels && be_verbose) { 2330 if (show_textrels && be_verbose)
2022 if (which("objdump") != NULL) 2331 objdump = which("objdump", "OBJDUMP");
2023 has_objdump = 1; 2332 /* precompile all the regexes */
2333 if (g_match) {
2334 regex_t preg;
2335 const char *this_sym;
2336 size_t n;
2337 int flags = REG_EXTENDED | REG_NOSUB | (g_match > 1 ? REG_ICASE : 0);
2338
2339 array_for_each(find_sym_arr, n, this_sym) {
2340 /* see scanelf_match_symname for logic info */
2341 switch (this_sym[0]) {
2342 case '%':
2343 while (*(this_sym++))
2344 if (*this_sym == '%') {
2345 ++this_sym;
2346 break;
2347 }
2348 break;
2349 case '+':
2350 case '-':
2351 ++this_sym;
2352 break;
2353 }
2354 if (*this_sym == '*')
2355 ++this_sym;
2356
2357 ret = regcomp(&preg, this_sym, flags);
2358 if (ret) {
2359 char err[256];
2360 regerror(ret, &preg, err, sizeof(err));
2361 err("regcomp of %s failed: %s", this_sym, err);
2362 }
2363 xarraypush(find_sym_regex_arr, &preg, sizeof(preg));
2364 }
2024 } 2365 }
2025 /* flatten arrays for display */ 2366 /* flatten arrays for display */
2026 if (array_cnt(find_lib_arr)) 2367 find_sym = array_flatten_str(find_sym_arr);
2027 find_lib = array_flatten_str(find_lib_arr); 2368 find_lib = array_flatten_str(find_lib_arr);
2028 if (array_cnt(find_section_arr))
2029 find_section = array_flatten_str(find_section_arr); 2369 find_section = array_flatten_str(find_section_arr);
2030 /* let the format option override all other options */ 2370 /* let the format option override all other options */
2031 if (out_format) { 2371 if (out_format) {
2032 show_pax = show_phdr = show_textrel = show_rpath = \ 2372 show_pax = show_phdr = show_textrel = show_rpath = \
2033 show_needed = show_interp = show_bind = show_soname = \ 2373 show_needed = show_interp = show_bind = show_soname = \
2034 show_textrels = show_perms = show_endian = show_size = \ 2374 show_textrels = show_perms = show_endian = show_size = \
2062 case 'i': show_interp = 1; break; 2402 case 'i': show_interp = 1; break;
2063 case 'b': show_bind = 1; break; 2403 case 'b': show_bind = 1; break;
2064 case 'S': show_soname = 1; break; 2404 case 'S': show_soname = 1; break;
2065 case 'T': show_textrels = 1; break; 2405 case 'T': show_textrels = 1; break;
2066 default: 2406 default:
2067 err("Invalid format specifier '%c' (byte %i)", 2407 err("invalid format specifier '%c' (byte %i)",
2068 out_format[i], i+1); 2408 out_format[i], i+1);
2069 } 2409 }
2070 } 2410 }
2071 2411
2072 /* construct our default format */ 2412 /* construct our default format */
2095 if (!be_quiet) xstrcat(&out_format, "%F ", &fmt_len); 2435 if (!be_quiet) xstrcat(&out_format, "%F ", &fmt_len);
2096 } 2436 }
2097 if (be_verbose > 2) printf("Format: %s\n", out_format); 2437 if (be_verbose > 2) printf("Format: %s\n", out_format);
2098 2438
2099 /* now lets actually do the scanning */ 2439 /* now lets actually do the scanning */
2100 if (scan_ldpath || use_ldcache) 2440 if (load_cache_config)
2101 load_ld_cache_config(0, __PAX_UTILS_DEFAULT_LD_CACHE_CONFIG); 2441 load_ld_cache_config(__PAX_UTILS_DEFAULT_LD_CACHE_CONFIG);
2102 if (scan_ldpath) scanelf_ldpath(); 2442 if (scan_ldpath) scanelf_ldpath();
2103 if (scan_envpath) scanelf_envpath(); 2443 if (scan_envpath) scanelf_envpath();
2104 if (!from_file && optind == argc && ttyname(0) == NULL && !scan_ldpath && !scan_envpath) 2444 if (!from_file && optind == argc && ttyname(0) == NULL && !scan_ldpath && !scan_envpath)
2105 from_file = "-"; 2445 from_file = "-";
2106 if (from_file) { 2446 if (from_file) {
2112 while (optind < argc) { 2452 while (optind < argc) {
2113 search_path = argv[optind++]; 2453 search_path = argv[optind++];
2114 ret = scanelf_dir(search_path); 2454 ret = scanelf_dir(search_path);
2115 } 2455 }
2116 2456
2457#ifdef __PAX_UTILS_CLEANUP
2117 /* clean up */ 2458 /* clean up */
2118 xarrayfree(ldpaths); 2459 xarrayfree(ldpaths);
2460 xarrayfree(find_sym_arr);
2119 xarrayfree(find_lib_arr); 2461 xarrayfree(find_lib_arr);
2120 xarrayfree(find_section_arr); 2462 xarrayfree(find_section_arr);
2463 free(find_sym);
2121 free(find_lib); 2464 free(find_lib);
2122 free(find_section); 2465 free(find_section);
2466 {
2467 size_t n;
2468 regex_t *preg;
2469 array_for_each(find_sym_regex_arr, n, preg)
2470 regfree(preg);
2471 xarrayfree(find_sym_regex_arr);
2472 }
2123 2473
2124 if (ldcache != 0) 2474 if (ldcache != 0)
2125 munmap(ldcache, ldcache_size); 2475 munmap(ldcache, ldcache_size);
2476#endif
2477
2126 return ret; 2478 return ret;
2127} 2479}
2128 2480
2129static char **get_split_env(const char *envvar) 2481static char **get_split_env(const char *envvar)
2130{ 2482{
2187 ret = parseargs(argc, argv); 2539 ret = parseargs(argc, argv);
2188 fclose(stdout); 2540 fclose(stdout);
2189#ifdef __PAX_UTILS_CLEANUP 2541#ifdef __PAX_UTILS_CLEANUP
2190 cleanup(); 2542 cleanup();
2191 warn("The calls to add/delete heap should be off:\n" 2543 warn("The calls to add/delete heap should be off:\n"
2192 "\t- 1 due to the out_buffer not being freed in scanelf_file()\n" 2544 "\t- 1 due to the out_buffer not being freed in scanelf_fileat()\n"
2193 "\t- 1 per QA_TEXTRELS/QA_EXECSTACK/QA_WX_LOAD"); 2545 "\t- 1 per QA_TEXTRELS/QA_EXECSTACK/QA_WX_LOAD");
2194#endif 2546#endif
2195 return ret; 2547 return ret;
2196} 2548}
2197 2549

Legend:
Removed from v.1.229  
changed lines
  Added in v.1.276

  ViewVC Help
Powered by ViewVC 1.1.20