/[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.185 Revision 1.226
1/* 1/*
2 * Copyright 2003-2007 Gentoo Foundation 2 * Copyright 2003-2007 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.185 2007/08/18 04:59:32 vapier Exp $ 4 * $Header: /var/cvsroot/gentoo-projects/pax-utils/Attic/scanelf.c,v 1.226 2011/09/27 18:37:22 vapier Exp $
5 * 5 *
6 * Copyright 2003-2007 Ned Ludd - <solar@gentoo.org> 6 * Copyright 2003-2007 Ned Ludd - <solar@gentoo.org>
7 * Copyright 2004-2007 Mike Frysinger - <vapier@gentoo.org> 7 * Copyright 2004-2007 Mike Frysinger - <vapier@gentoo.org>
8 */ 8 */
9 9
10static const char *rcsid = "$Id: scanelf.c,v 1.226 2011/09/27 18:37:22 vapier Exp $";
11const char argv0[] = "scanelf";
12
10#include "paxinc.h" 13#include "paxinc.h"
11
12static const char *rcsid = "$Id: scanelf.c,v 1.185 2007/08/18 04:59:32 vapier Exp $";
13#define argv0 "scanelf"
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);
25static void scanelf_envpath(void); 25static void scanelf_envpath(void);
26static void usage(int status); 26static void usage(int status);
27static char **get_split_env(const char *envvar); 27static char **get_split_env(const char *envvar);
28static void parseenv(void); 28static void parseenv(void);
29static int parseargs(int argc, char *argv[]); 29static int parseargs(int argc, char *argv[]);
30static char *xstrdup(const char *s);
31static void *xmalloc(size_t size);
32static void *xrealloc(void *ptr, size_t size);
33static void xstrncat(char **dst, const char *src, size_t *curr_len, size_t n);
34#define xstrcat(dst,src,curr_len) xstrncat(dst,src,curr_len,0)
35static inline void xchrcat(char **dst, const char append, size_t *curr_len);
36static int rematch(const char *regex, const char *match, int cflags);
37 30
38/* variables to control behavior */ 31/* variables to control behavior */
39static char match_etypes[126] = ""; 32static char match_etypes[126] = "";
40static char *ldpaths[256]; 33static char *ldpaths[256];
41static char scan_ldpath = 0; 34static char scan_ldpath = 0;
44static char scan_archives = 0; 37static char scan_archives = 0;
45static char dir_recurse = 0; 38static char dir_recurse = 0;
46static char dir_crossmount = 1; 39static char dir_crossmount = 1;
47static char show_pax = 0; 40static char show_pax = 0;
48static char show_perms = 0; 41static char show_perms = 0;
42static char show_size = 0;
49static char show_phdr = 0; 43static char show_phdr = 0;
50static char show_textrel = 0; 44static char show_textrel = 0;
51static char show_rpath = 0; 45static char show_rpath = 0;
52static char show_needed = 0; 46static char show_needed = 0;
53static char show_interp = 0; 47static char show_interp = 0;
54static char show_bind = 0; 48static char show_bind = 0;
55static char show_soname = 0; 49static char show_soname = 0;
56static char show_textrels = 0; 50static char show_textrels = 0;
57static char show_banner = 1; 51static char show_banner = 1;
58static char show_endian = 0; 52static char show_endian = 0;
53static char show_osabi = 0;
54static char show_eabi = 0;
59static char be_quiet = 0; 55static char be_quiet = 0;
60static char be_verbose = 0; 56static char be_verbose = 0;
61static char be_wewy_wewy_quiet = 0; 57static char be_wewy_wewy_quiet = 0;
62static char be_semi_verbose = 0; 58static char be_semi_verbose = 0;
63static char *find_sym = NULL, *versioned_symname = NULL; 59static char *find_sym = NULL;
64static char *find_lib = NULL; 60static char *find_lib = NULL;
61static array_t _find_lib_arr = array_init_decl, *find_lib_arr = &_find_lib_arr;
65static char *find_section = NULL; 62static char *find_section = NULL;
63static array_t _find_section_arr = array_init_decl, *find_section_arr = &_find_section_arr;
66static char *out_format = NULL; 64static char *out_format = NULL;
67static char *search_path = NULL; 65static char *search_path = NULL;
68static char fix_elf = 0; 66static char fix_elf = 0;
69static char g_match = 0; 67static char g_match = 0;
70static char use_ldcache = 0; 68static char use_ldcache = 0;
71 69
72static char **qa_textrels = NULL; 70static char **qa_textrels = NULL;
73static char **qa_execstack = NULL; 71static char **qa_execstack = NULL;
74static char **qa_wx_load = NULL; 72static char **qa_wx_load = NULL;
73static char *root;
75 74
76int match_bits = 0; 75static int match_bits = 0;
77unsigned int match_perms = 0; 76static unsigned int match_perms = 0;
78caddr_t ldcache = 0; 77static void *ldcache = NULL;
79size_t ldcache_size = 0; 78static size_t ldcache_size = 0;
80unsigned long setpax = 0UL; 79static unsigned long setpax = 0UL;
81 80
82int has_objdump = 0; 81static int has_objdump = 0;
83
84static char *getstr_perms(const char *fname);
85static char *getstr_perms(const char *fname) {
86 struct stat st;
87 static char buf[8];
88
89 if ((stat(fname, &st)) == (-1))
90 return (char *) "";
91
92 snprintf(buf, sizeof(buf), "%o", st.st_mode);
93
94 return (char *) buf + 2;
95}
96 82
97/* find the path to a file by name */ 83/* find the path to a file by name */
98static char *which(const char *fname) 84static char *which(const char *fname)
99{ 85{
100 static char fullpath[BUFSIZ]; 86 static char fullpath[__PAX_UTILS_PATH_MAX];
101 char *path, *p; 87 char *path, *p;
102 88
103 path = getenv("PATH"); 89 path = getenv("PATH");
104 if (!path) 90 if (!path)
105 return NULL; 91 return NULL;
106 92
107 path = xstrdup(path); 93 path = xstrdup(path);
108 while ((p = strrchr(path, ':')) != NULL) { 94 while ((p = strrchr(path, ':')) != NULL) {
109 snprintf(fullpath, sizeof(fullpath), "%s/%s", p + 1, fname); 95 snprintf(fullpath, sizeof(fullpath), "%s/%s", p + 1, fname);
110 *p = 0; 96 *p = 0;
111 if (access(fullpath, R_OK) != (-1)) { 97 if (access(fullpath, R_OK) != -1) {
112 free(path); 98 free(path);
113 return (char *) fullpath; 99 return fullpath;
114 } 100 }
115 } 101 }
116 free(path); 102 free(path);
117 return NULL; 103 return NULL;
118} 104}
123 regex_t preg; 109 regex_t preg;
124 int ret; 110 int ret;
125 111
126 if ((match == NULL) || (regex == NULL)) 112 if ((match == NULL) || (regex == NULL))
127 return EXIT_FAILURE; 113 return EXIT_FAILURE;
128
129 114
130 if ((ret = regcomp(&preg, regex, cflags))) { 115 if ((ret = regcomp(&preg, regex, cflags))) {
131 char err[256]; 116 char err[256];
132 117
133 if (regerror(ret, &preg, err, sizeof(err))) 118 if (regerror(ret, &preg, err, sizeof(err)))
145 130
146/* sub-funcs for scanelf_file() */ 131/* sub-funcs for scanelf_file() */
147static void scanelf_file_get_symtabs(elfobj *elf, void **sym, void **tab) 132static void scanelf_file_get_symtabs(elfobj *elf, void **sym, void **tab)
148{ 133{
149 /* find the best SHT_DYNSYM and SHT_STRTAB sections */ 134 /* find the best SHT_DYNSYM and SHT_STRTAB sections */
135
136 /* debug sections */
137 void *symtab = elf_findsecbyname(elf, ".symtab");
138 void *strtab = elf_findsecbyname(elf, ".strtab");
139 /* runtime sections */
140 void *dynsym = elf_findsecbyname(elf, ".dynsym");
141 void *dynstr = elf_findsecbyname(elf, ".dynstr");
142
150#define GET_SYMTABS(B) \ 143#define GET_SYMTABS(B) \
151 if (elf->elf_class == ELFCLASS ## B) { \ 144 if (elf->elf_class == ELFCLASS ## B) { \
152 Elf ## B ## _Shdr *symtab, *strtab, *dynsym, *dynstr; \
153 /* debug sections */ \
154 symtab = SHDR ## B (elf_findsecbyname(elf, ".symtab")); \
155 strtab = SHDR ## B (elf_findsecbyname(elf, ".strtab")); \
156 /* runtime sections */ \
157 dynsym = SHDR ## B (elf_findsecbyname(elf, ".dynsym")); \
158 dynstr = SHDR ## B (elf_findsecbyname(elf, ".dynstr")); \
159 if (symtab && dynsym) { \ 145 if (symtab && dynsym) { \
146 Elf ## B ## _Shdr *esymtab = symtab; \
147 Elf ## B ## _Shdr *edynsym = dynsym; \
160 *sym = (void*)((EGET(symtab->sh_size) > EGET(dynsym->sh_size)) ? symtab : dynsym); \ 148 *sym = (EGET(esymtab->sh_size) > EGET(edynsym->sh_size)) ? symtab : dynsym; \
161 } else { \ 149 } else \
162 *sym = (void*)(symtab ? symtab : dynsym); \ 150 *sym = symtab ? symtab : dynsym; \
163 } \
164 if (strtab && dynstr) { \ 151 if (strtab && dynstr) { \
152 Elf ## B ## _Shdr *estrtab = strtab; \
153 Elf ## B ## _Shdr *edynstr = dynstr; \
165 *tab = (void*)((EGET(strtab->sh_size) > EGET(dynstr->sh_size)) ? strtab : dynstr); \ 154 *tab = (EGET(estrtab->sh_size) > EGET(edynstr->sh_size)) ? strtab : dynstr; \
166 } else { \ 155 } else \
167 *tab = (void*)(strtab ? strtab : dynstr); \ 156 *tab = strtab ? strtab : dynstr; \
168 } \
169 } 157 }
170 GET_SYMTABS(32) 158 GET_SYMTABS(32)
171 GET_SYMTABS(64) 159 GET_SYMTABS(64)
172} 160}
173 161
202 } \ 190 } \
203 } 191 }
204 SHOW_PAX(32) 192 SHOW_PAX(32)
205 SHOW_PAX(64) 193 SHOW_PAX(64)
206 } 194 }
207
208 195
209 if (fix_elf && setpax) { 196 if (fix_elf && setpax) {
210 /* set the chpax settings */ 197 /* set the chpax settings */
211 if (elf->elf_class == ELFCLASS32) { 198 if (elf->elf_class == ELFCLASS32) {
212 if (EHDR32(elf->ehdr)->e_type == ET_DYN || EHDR32(elf->ehdr)->e_type == ET_EXEC) 199 if (EHDR32(elf->ehdr)->e_type == ET_DYN || EHDR32(elf->ehdr)->e_type == ET_EXEC)
271 warnf("%s: multiple PT_GNU_RELRO's !?", elf->filename); \ 258 warnf("%s: multiple PT_GNU_RELRO's !?", elf->filename); \
272 found = found_relro; \ 259 found = found_relro; \
273 offset = 4; \ 260 offset = 4; \
274 check_flags = PF_X; \ 261 check_flags = PF_X; \
275 } else if (EGET(phdr[i].p_type) == PT_LOAD) { \ 262 } else if (EGET(phdr[i].p_type) == PT_LOAD) { \
276 if (ehdr->e_type == ET_DYN || ehdr->e_type == ET_EXEC) \ 263 if (EGET(ehdr->e_type) == ET_DYN || EGET(ehdr->e_type) == ET_EXEC) \
277 if (multi_load++ > max_pt_load) \ 264 if (multi_load++ > max_pt_load) \
278 warnf("%s: more than %i PT_LOAD's !?", elf->filename, max_pt_load); \ 265 warnf("%s: more than %i PT_LOAD's !?", elf->filename, max_pt_load); \
279 if (file_matches_list(elf->filename, qa_wx_load)) \ 266 if (file_matches_list(elf->filename, qa_wx_load)) \
280 continue; \ 267 continue; \
281 found = found_load; \ 268 found = found_load; \
298 } else if (elf->shdr != NULL) { \ 285 } else if (elf->shdr != NULL) { \
299 /* no program headers which means this is prob an object file */ \ 286 /* no program headers which means this is prob an object file */ \
300 Elf ## B ## _Shdr *shdr = SHDR ## B (elf->shdr); \ 287 Elf ## B ## _Shdr *shdr = SHDR ## B (elf->shdr); \
301 Elf ## B ## _Shdr *strtbl = shdr + EGET(ehdr->e_shstrndx); \ 288 Elf ## B ## _Shdr *strtbl = shdr + EGET(ehdr->e_shstrndx); \
302 char *str; \ 289 char *str; \
303 if ((void*)strtbl > (void*)elf->data_end) \ 290 if ((void*)strtbl > elf->data_end) \
304 goto skip_this_shdr##B; \ 291 goto skip_this_shdr##B; \
305 check_flags = SHF_WRITE|SHF_EXECINSTR; \ 292 check_flags = SHF_WRITE|SHF_EXECINSTR; \
306 for (i = 0; i < EGET(ehdr->e_shnum); ++i) { \ 293 for (i = 0; i < EGET(ehdr->e_shnum); ++i) { \
307 if (EGET(shdr[i].sh_type) != SHT_PROGBITS) continue; \ 294 if (EGET(shdr[i].sh_type) != SHT_PROGBITS) continue; \
308 offset = EGET(strtbl->sh_offset) + EGET(shdr[i].sh_name); \ 295 offset = EGET(strtbl->sh_offset) + EGET(shdr[i].sh_name); \
339 return NULL; 326 return NULL;
340 else 327 else
341 return ret; 328 return ret;
342} 329}
343 330
331/*
332 * See if this ELF contains a DT_TEXTREL tag in any of its
333 * PT_DYNAMIC sections.
334 */
344static const char *scanelf_file_textrel(elfobj *elf, char *found_textrel) 335static const char *scanelf_file_textrel(elfobj *elf, char *found_textrel)
345{ 336{
346 static const char *ret = "TEXTREL"; 337 static const char *ret = "TEXTREL";
347 unsigned long i; 338 unsigned long i;
348 339
359 Elf ## B ## _Off offset; \ 350 Elf ## B ## _Off offset; \
360 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \ 351 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
361 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \ 352 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \
362 offset = EGET(phdr[i].p_offset); \ 353 offset = EGET(phdr[i].p_offset); \
363 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \ 354 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \
364 dyn = DYN ## B (elf->data + offset); \ 355 dyn = DYN ## B (elf->vdata + offset); \
365 while (EGET(dyn->d_tag) != DT_NULL) { \ 356 while (EGET(dyn->d_tag) != DT_NULL) { \
366 if (EGET(dyn->d_tag) == DT_TEXTREL) { /*dyn->d_tag != DT_FLAGS)*/ \ 357 if (EGET(dyn->d_tag) == DT_TEXTREL) { /*dyn->d_tag != DT_FLAGS)*/ \
367 *found_textrel = 1; \ 358 *found_textrel = 1; \
368 /*if (dyn->d_un.d_val & DF_TEXTREL)*/ \ 359 /*if (dyn->d_un.d_val & DF_TEXTREL)*/ \
369 return (be_wewy_wewy_quiet ? NULL : ret); \ 360 return (be_wewy_wewy_quiet ? NULL : ret); \
379 return NULL; 370 return NULL;
380 else 371 else
381 return " - "; 372 return " - ";
382} 373}
383 374
375/*
376 * Scan the .text section to see if there are any relocations in it.
377 * Should rewrite this to check PT_LOAD sections that are marked
378 * Executable rather than the section named '.text'.
379 */
384static char *scanelf_file_textrels(elfobj *elf, char *found_textrels, char *found_textrel) 380static char *scanelf_file_textrels(elfobj *elf, char *found_textrels, char *found_textrel)
385{ 381{
386 unsigned long s, r, rmax; 382 unsigned long s, r, rmax;
387 void *symtab_void, *strtab_void, *text_void; 383 void *symtab_void, *strtab_void, *text_void;
388 384
409 Elf ## B ## _Rela *rela; \ 405 Elf ## B ## _Rela *rela; \
410 /* search the section headers for relocations */ \ 406 /* search the section headers for relocations */ \
411 for (s = 0; s < EGET(ehdr->e_shnum); ++s) { \ 407 for (s = 0; s < EGET(ehdr->e_shnum); ++s) { \
412 uint32_t sh_type = EGET(shdr[s].sh_type); \ 408 uint32_t sh_type = EGET(shdr[s].sh_type); \
413 if (sh_type == SHT_REL) { \ 409 if (sh_type == SHT_REL) { \
414 rel = REL ## B (elf->data + EGET(shdr[s].sh_offset)); \ 410 rel = REL ## B (elf->vdata + EGET(shdr[s].sh_offset)); \
415 rela = NULL; \ 411 rela = NULL; \
416 rmax = EGET(shdr[s].sh_size) / sizeof(*rel); \ 412 rmax = EGET(shdr[s].sh_size) / sizeof(*rel); \
417 } else if (sh_type == SHT_RELA) { \ 413 } else if (sh_type == SHT_RELA) { \
418 rel = NULL; \ 414 rel = NULL; \
419 rela = RELA ## B (elf->data + EGET(shdr[s].sh_offset)); \ 415 rela = RELA ## B (elf->vdata + EGET(shdr[s].sh_offset)); \
420 rmax = EGET(shdr[s].sh_size) / sizeof(*rela); \ 416 rmax = EGET(shdr[s].sh_size) / sizeof(*rela); \
421 } else \ 417 } else \
422 continue; \ 418 continue; \
423 /* now see if any of the relocs are in the .text */ \ 419 /* now see if any of the relocs are in the .text */ \
424 for (r = 0; r < rmax; ++r) { \ 420 for (r = 0; r < rmax; ++r) { \
439 if (r_offset < vaddr || r_offset >= vaddr + memsz) { \ 435 if (r_offset < vaddr || r_offset >= vaddr + memsz) { \
440 if (be_verbose <= 2) continue; \ 436 if (be_verbose <= 2) continue; \
441 } else \ 437 } else \
442 *found_textrels = 1; \ 438 *found_textrels = 1; \
443 /* locate this relocation symbol name */ \ 439 /* locate this relocation symbol name */ \
444 sym = SYM ## B (elf->data + EGET(symtab->sh_offset)); \ 440 sym = SYM ## B (elf->vdata + EGET(symtab->sh_offset)); \
445 if ((void*)sym > (void*)elf->data_end) { \ 441 if ((void*)sym > elf->data_end) { \
446 warn("%s: corrupt ELF symbol", elf->filename); \ 442 warn("%s: corrupt ELF symbol", elf->filename); \
447 continue; \ 443 continue; \
448 } \ 444 } \
449 sym_max = ELF ## B ## _R_SYM(r_info); \ 445 sym_max = ELF ## B ## _R_SYM(r_info); \
450 if (sym_max * EGET(symtab->sh_entsize) < symtab->sh_size) \ 446 if (sym_max * EGET(symtab->sh_entsize) < symtab->sh_size) \
453 sym = NULL; \ 449 sym = NULL; \
454 sym_max = EGET(symtab->sh_size) / EGET(symtab->sh_entsize); \ 450 sym_max = EGET(symtab->sh_size) / EGET(symtab->sh_entsize); \
455 /* show the raw details about this reloc */ \ 451 /* show the raw details about this reloc */ \
456 printf(" %s: ", elf->base_filename); \ 452 printf(" %s: ", elf->base_filename); \
457 if (sym && sym->st_name) \ 453 if (sym && sym->st_name) \
458 printf("%s", (char*)(elf->data + EGET(strtab->sh_offset) + EGET(sym->st_name))); \ 454 printf("%s", elf->data + EGET(strtab->sh_offset) + EGET(sym->st_name)); \
459 else \ 455 else \
460 printf("(memory/data?)"); \ 456 printf("(memory/data?)"); \
461 printf(" [0x%lX]", (unsigned long)r_offset); \ 457 printf(" [0x%lX]", (unsigned long)r_offset); \
462 /* now try to find the closest symbol that this rel is probably in */ \ 458 /* now try to find the closest symbol that this rel is probably in */ \
463 sym = SYM ## B (elf->data + EGET(symtab->sh_offset)); \ 459 sym = SYM ## B (elf->vdata + EGET(symtab->sh_offset)); \
464 func = NULL; \ 460 func = NULL; \
465 offset_tmp = 0; \ 461 offset_tmp = 0; \
466 while (sym_max--) { \ 462 while (sym_max--) { \
467 if (EGET(sym->st_value) < r_offset && EGET(sym->st_value) > offset_tmp) { \ 463 if (EGET(sym->st_value) < r_offset && EGET(sym->st_value) > offset_tmp) { \
468 func = sym; \ 464 func = sym; \
479 printf("%s", func_name); \ 475 printf("%s", func_name); \
480 } else \ 476 } else \
481 printf("(optimized out)"); \ 477 printf("(optimized out)"); \
482 printf(" [0x%lX]\n", (unsigned long)offset_tmp); \ 478 printf(" [0x%lX]\n", (unsigned long)offset_tmp); \
483 if (be_verbose && has_objdump) { \ 479 if (be_verbose && has_objdump) { \
480 Elf ## B ## _Addr end_addr = offset_tmp + EGET(func->st_size); \
484 char *sysbuf; \ 481 char *sysbuf; \
485 size_t syslen; \ 482 size_t syslen; \
483 int sysret; \
486 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"; \ 484 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"; \
487 syslen = sizeof(sysfmt) + strlen(elf->filename) + 3 * sizeof(unsigned long) + 1; \ 485 syslen = sizeof(sysfmt) + strlen(elf->filename) + 3 * sizeof(unsigned long) + 1; \
488 sysbuf = xmalloc(syslen); \ 486 sysbuf = xmalloc(syslen); \
489 if (sysbuf) { \
490 Elf ## B ## _Addr end_addr = offset_tmp + EGET(func->st_size); \
491 if (end_addr < r_offset) \ 487 if (end_addr < r_offset) \
492 /* not uncommon when things are optimized out */ \ 488 /* not uncommon when things are optimized out */ \
493 end_addr = r_offset + 0x100; \ 489 end_addr = r_offset + 0x100; \
494 snprintf(sysbuf, syslen, sysfmt, \ 490 snprintf(sysbuf, syslen, sysfmt, \
495 (unsigned long)offset_tmp, \ 491 (unsigned long)offset_tmp, \
496 (unsigned long)end_addr, \ 492 (unsigned long)end_addr, \
497 elf->filename, \ 493 elf->filename, \
498 (unsigned long)r_offset); \ 494 (unsigned long)r_offset); \
499 fflush(stdout); \ 495 fflush(stdout); \
500 system(sysbuf); \ 496 sysret = system(sysbuf); \
501 fflush(stdout); \ 497 fflush(stdout); \
502 free(sysbuf); \ 498 free(sysbuf); \
503 } \
504 } \ 499 } \
505 } \ 500 } \
506 } } 501 } }
507 SHOW_TEXTRELS(32) 502 SHOW_TEXTRELS(32)
508 SHOW_TEXTRELS(64) 503 SHOW_TEXTRELS(64)
562 /* Just scan dynamic headers */ \ 557 /* Just scan dynamic headers */ \
563 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \ 558 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \
564 offset = EGET(phdr[i].p_offset); \ 559 offset = EGET(phdr[i].p_offset); \
565 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \ 560 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \
566 /* Just scan dynamic RPATH/RUNPATH headers */ \ 561 /* Just scan dynamic RPATH/RUNPATH headers */ \
567 dyn = DYN ## B (elf->data + offset); \ 562 dyn = DYN ## B (elf->vdata + offset); \
568 while ((word=EGET(dyn->d_tag)) != DT_NULL) { \ 563 while ((word=EGET(dyn->d_tag)) != DT_NULL) { \
569 if (word == DT_RPATH) { \ 564 if (word == DT_RPATH) { \
570 r = &rpath; \ 565 r = &rpath; \
571 } else if (word == DT_RUNPATH) { \ 566 } else if (word == DT_RUNPATH) { \
572 r = &runpath; \ 567 r = &runpath; \
576 } \ 571 } \
577 /* Verify the memory is somewhat sane */ \ 572 /* Verify the memory is somewhat sane */ \
578 offset = EGET(strtbl->sh_offset) + EGET(dyn->d_un.d_ptr); \ 573 offset = EGET(strtbl->sh_offset) + EGET(dyn->d_un.d_ptr); \
579 if (offset < (Elf ## B ## _Off)elf->len) { \ 574 if (offset < (Elf ## B ## _Off)elf->len) { \
580 if (*r) warn("ELF has multiple %s's !?", get_elfdtype(word)); \ 575 if (*r) warn("ELF has multiple %s's !?", get_elfdtype(word)); \
581 *r = (char*)(elf->data + offset); \ 576 *r = elf->data + offset; \
582 /* cache the length in case we need to nuke this section later on */ \ 577 /* cache the length in case we need to nuke this section later on */ \
583 if (fix_elf) \ 578 if (fix_elf) \
584 offset = strlen(*r); \ 579 offset = strlen(*r); \
585 /* If quiet, don't output paths in ld.so.conf */ \ 580 /* If quiet, don't output paths in ld.so.conf */ \
586 if (be_quiet) { \ 581 if (be_quiet) { \
702 697
703#if defined(__GLIBC__) || defined(__UCLIBC__) 698#if defined(__GLIBC__) || defined(__UCLIBC__)
704 699
705static char *lookup_cache_lib(elfobj *elf, char *fname) 700static char *lookup_cache_lib(elfobj *elf, char *fname)
706{ 701{
707 int fd = 0; 702 int fd;
708 char *strs; 703 char *strs;
709 static char buf[__PAX_UTILS_PATH_MAX] = ""; 704 static char buf[__PAX_UTILS_PATH_MAX] = "";
710 const char *cachefile = "/etc/ld.so.cache"; 705 const char cachefile[] = "/etc/ld.so.cache";
711 struct stat st; 706 struct stat st;
712 707
713 typedef struct { 708 typedef struct {
714 char magic[LDSO_CACHE_MAGIC_LEN]; 709 char magic[LDSO_CACHE_MAGIC_LEN];
715 char version[LDSO_CACHE_VER_LEN]; 710 char version[LDSO_CACHE_VER_LEN];
725 libentry_t *libent; 720 libentry_t *libent;
726 721
727 if (fname == NULL) 722 if (fname == NULL)
728 return NULL; 723 return NULL;
729 724
730 if (ldcache == 0) { 725 if (ldcache == NULL) {
731 if (stat(cachefile, &st) || (fd = open(cachefile, O_RDONLY)) == -1) 726 if (stat(cachefile, &st))
727 return NULL;
728
729 fd = open(cachefile, O_RDONLY);
730 if (fd == -1)
732 return NULL; 731 return NULL;
733 732
734 /* cache these values so we only map/unmap the cache file once */ 733 /* cache these values so we only map/unmap the cache file once */
735 ldcache_size = st.st_size; 734 ldcache_size = st.st_size;
736 ldcache = mmap(0, ldcache_size, PROT_READ, MAP_SHARED, fd, 0); 735 header = ldcache = mmap(0, ldcache_size, PROT_READ, MAP_SHARED, fd, 0);
737
738 close(fd); 736 close(fd);
739 737
740 if (ldcache == (caddr_t)-1) { 738 if (ldcache == MAP_FAILED) {
741 ldcache = 0; 739 ldcache = NULL;
742 return NULL; 740 return NULL;
743 } 741 }
744 742
745 if (memcmp(((header_t *) ldcache)->magic, LDSO_CACHE_MAGIC, LDSO_CACHE_MAGIC_LEN)) 743 if (memcmp(header->magic, LDSO_CACHE_MAGIC, LDSO_CACHE_MAGIC_LEN) ||
744 memcmp(header->version, LDSO_CACHE_VER, LDSO_CACHE_VER_LEN))
745 {
746 munmap(ldcache, ldcache_size);
747 ldcache = NULL;
746 return NULL; 748 return NULL;
747 if (memcmp (((header_t *) ldcache)->version, LDSO_CACHE_VER, LDSO_CACHE_VER_LEN))
748 return NULL;
749 } 749 }
750 } else
751 header = ldcache;
750 752
751 header = (header_t *) ldcache;
752 libent = (libentry_t *) (ldcache + sizeof(header_t)); 753 libent = ldcache + sizeof(header_t);
753 strs = (char *) &libent[header->nlibs]; 754 strs = (char *) &libent[header->nlibs];
754 755
755 for (fd = 0; fd < header->nlibs; fd++) { 756 for (fd = 0; fd < header->nlibs; ++fd) {
756 /* this should be more fine grained, but for now we assume that 757 /* This should be more fine grained, but for now we assume that
757 * diff arches will not be cached together. and we ignore the 758 * diff arches will not be cached together, and we ignore the
758 * the different multilib mips cases. */ 759 * the different multilib mips cases.
760 */
759 if (elf->elf_class == ELFCLASS64 && !(libent[fd].flags & FLAG_REQUIRED_MASK)) 761 if (elf->elf_class == ELFCLASS64 && !(libent[fd].flags & FLAG_REQUIRED_MASK))
760 continue; 762 continue;
761 if (elf->elf_class == ELFCLASS32 && (libent[fd].flags & FLAG_REQUIRED_MASK)) 763 if (elf->elf_class == ELFCLASS32 && (libent[fd].flags & FLAG_REQUIRED_MASK))
762 continue; 764 continue;
763 765
764 if (strcmp(fname, strs + libent[fd].sooffset) != 0) 766 if (strcmp(fname, strs + libent[fd].sooffset) != 0)
765 continue; 767 continue;
768
769 /* Return first hit because that is how the ldso rolls */
766 strncpy(buf, strs + libent[fd].liboffset, sizeof(buf)); 770 strncpy(buf, strs + libent[fd].liboffset, sizeof(buf));
771 break;
767 } 772 }
773
768 return buf; 774 return buf;
769} 775}
776
770#elif defined(__NetBSD__) 777#elif defined(__NetBSD__)
771static char *lookup_cache_lib(elfobj *elf, char *fname) 778static char *lookup_cache_lib(elfobj *elf, char *fname)
772{ 779{
773 static char buf[__PAX_UTILS_PATH_MAX] = ""; 780 static char buf[__PAX_UTILS_PATH_MAX] = "";
774 static struct stat st; 781 static struct stat st;
791 798
792 /* not found in any path */ 799 /* not found in any path */
793 return NULL; 800 return NULL;
794} 801}
795#else 802#else
803#ifdef __ELF__
796#warning Cache support not implemented for your target 804#warning Cache support not implemented for your target
805#endif
797static char *lookup_cache_lib(elfobj *elf, char *fname) 806static char *lookup_cache_lib(elfobj *elf, char *fname)
798{ 807{
799 return NULL; 808 return NULL;
800} 809}
801#endif 810#endif
805 unsigned long i; 814 unsigned long i;
806 char *needed; 815 char *needed;
807 void *strtbl_void; 816 void *strtbl_void;
808 char *p; 817 char *p;
809 818
819 /*
820 * -n -> op==0 -> print all
821 * -N -> op==1 -> print requested
822 */
810 if ((op==0 && !show_needed) || (op==1 && !find_lib)) return NULL; 823 if ((op == 0 && !show_needed) || (op == 1 && !find_lib))
824 return NULL;
811 825
812 strtbl_void = elf_findsecbyname(elf, ".dynstr"); 826 strtbl_void = elf_findsecbyname(elf, ".dynstr");
813 827
814 if (elf->phdr && strtbl_void) { 828 if (elf->phdr && strtbl_void) {
815#define SHOW_NEEDED(B) \ 829#define SHOW_NEEDED(B) \
817 Elf ## B ## _Dyn *dyn; \ 831 Elf ## B ## _Dyn *dyn; \
818 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \ 832 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
819 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \ 833 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \
820 Elf ## B ## _Shdr *strtbl = SHDR ## B (strtbl_void); \ 834 Elf ## B ## _Shdr *strtbl = SHDR ## B (strtbl_void); \
821 Elf ## B ## _Off offset; \ 835 Elf ## B ## _Off offset; \
836 size_t matched = 0; \
837 /* Walk all the program headers to find the PT_DYNAMIC */ \
822 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \ 838 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
823 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \ 839 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) \
840 continue; \
824 offset = EGET(phdr[i].p_offset); \ 841 offset = EGET(phdr[i].p_offset); \
825 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \ 842 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) \
843 continue; \
844 /* Walk all the dynamic tags to find NEEDED entries */ \
826 dyn = DYN ## B (elf->data + offset); \ 845 dyn = DYN ## B (elf->vdata + offset); \
827 while (EGET(dyn->d_tag) != DT_NULL) { \ 846 while (EGET(dyn->d_tag) != DT_NULL) { \
828 if (EGET(dyn->d_tag) == DT_NEEDED) { \ 847 if (EGET(dyn->d_tag) == DT_NEEDED) { \
829 offset = EGET(strtbl->sh_offset) + EGET(dyn->d_un.d_ptr); \ 848 offset = EGET(strtbl->sh_offset) + EGET(dyn->d_un.d_ptr); \
830 if (offset >= (Elf ## B ## _Off)elf->len) { \ 849 if (offset >= (Elf ## B ## _Off)elf->len) { \
831 ++dyn; \ 850 ++dyn; \
832 continue; \ 851 continue; \
833 } \ 852 } \
834 needed = (char*)(elf->data + offset); \ 853 needed = elf->data + offset; \
835 if (op == 0) { \ 854 if (op == 0) { \
855 /* -n -> print all entries */ \
836 if (!be_wewy_wewy_quiet) { \ 856 if (!be_wewy_wewy_quiet) { \
837 if (*found_needed) xchrcat(ret, ',', ret_len); \ 857 if (*found_needed) xchrcat(ret, ',', ret_len); \
838 if (use_ldcache) \ 858 if (use_ldcache) \
839 if ((p = lookup_cache_lib(elf, needed)) != NULL) \ 859 if ((p = lookup_cache_lib(elf, needed)) != NULL) \
840 needed = p; \ 860 needed = p; \
841 xstrcat(ret, needed, ret_len); \ 861 xstrcat(ret, needed, ret_len); \
842 } \ 862 } \
843 *found_needed = 1; \ 863 *found_needed = 1; \
844 } else { \ 864 } else { \
845 if (!strncmp(find_lib, needed, strlen( !g_match ? needed : find_lib))) { \ 865 /* -N -> print matching entries */ \
866 size_t n; \
867 const char *find_lib_name; \
868 \
869 array_for_each(find_lib_arr, n, find_lib_name) \
870 if (!strcmp(find_lib_name, needed)) \
871 ++matched; \
872 \
873 if (matched == array_cnt(find_lib_arr)) { \
846 *found_lib = 1; \ 874 *found_lib = 1; \
847 return (be_wewy_wewy_quiet ? NULL : needed); \ 875 return (be_wewy_wewy_quiet ? NULL : find_lib); \
848 } \ 876 } \
849 } \ 877 } \
850 } \ 878 } \
851 ++dyn; \ 879 ++dyn; \
852 } \ 880 } \
897 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \ 925 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
898 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \ 926 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \
899 dynamic = 1; \ 927 dynamic = 1; \
900 offset = EGET(phdr[i].p_offset); \ 928 offset = EGET(phdr[i].p_offset); \
901 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \ 929 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \
902 dyn = DYN ## B (elf->data + offset); \ 930 dyn = DYN ## B (elf->vdata + offset); \
903 while (EGET(dyn->d_tag) != DT_NULL) { \ 931 while (EGET(dyn->d_tag) != DT_NULL) { \
904 if (EGET(dyn->d_tag) == DT_BIND_NOW || \ 932 if (EGET(dyn->d_tag) == DT_BIND_NOW || \
905 (EGET(dyn->d_tag) == DT_FLAGS && EGET(dyn->d_un.d_val) & DF_BIND_NOW)) \ 933 (EGET(dyn->d_tag) == DT_FLAGS && EGET(dyn->d_un.d_val) & DF_BIND_NOW)) \
906 { \ 934 { \
907 if (be_quiet) return NULL; \ 935 if (be_quiet) return NULL; \
920 /* don't output anything if quiet mode and the ELF is static or not setuid */ 948 /* don't output anything if quiet mode and the ELF is static or not setuid */
921 if (be_quiet && (!dynamic || (!fstat(elf->fd, &s) && !(s.st_mode & (S_ISUID|S_ISGID))))) { 949 if (be_quiet && (!dynamic || (!fstat(elf->fd, &s) && !(s.st_mode & (S_ISUID|S_ISGID))))) {
922 return NULL; 950 return NULL;
923 } else { 951 } else {
924 *found_bind = 1; 952 *found_bind = 1;
925 return (char *) (dynamic ? "LAZY" : "STATIC"); 953 return (char *)(dynamic ? "LAZY" : "STATIC");
926 } 954 }
927} 955}
928static char *scanelf_file_soname(elfobj *elf, char *found_soname) 956static char *scanelf_file_soname(elfobj *elf, char *found_soname)
929{ 957{
930 unsigned long i; 958 unsigned long i;
942 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \ 970 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
943 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \ 971 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \
944 Elf ## B ## _Shdr *strtbl = SHDR ## B (strtbl_void); \ 972 Elf ## B ## _Shdr *strtbl = SHDR ## B (strtbl_void); \
945 Elf ## B ## _Off offset; \ 973 Elf ## B ## _Off offset; \
946 /* only look for soname in shared objects */ \ 974 /* only look for soname in shared objects */ \
947 if (ehdr->e_type != ET_DYN) \ 975 if (EGET(ehdr->e_type) != ET_DYN) \
948 return NULL; \ 976 return NULL; \
949 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \ 977 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
950 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \ 978 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \
951 offset = EGET(phdr[i].p_offset); \ 979 offset = EGET(phdr[i].p_offset); \
952 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \ 980 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \
953 dyn = DYN ## B (elf->data + offset); \ 981 dyn = DYN ## B (elf->vdata + offset); \
954 while (EGET(dyn->d_tag) != DT_NULL) { \ 982 while (EGET(dyn->d_tag) != DT_NULL) { \
955 if (EGET(dyn->d_tag) == DT_SONAME) { \ 983 if (EGET(dyn->d_tag) == DT_SONAME) { \
956 offset = EGET(strtbl->sh_offset) + EGET(dyn->d_un.d_ptr); \ 984 offset = EGET(strtbl->sh_offset) + EGET(dyn->d_un.d_ptr); \
957 if (offset >= (Elf ## B ## _Off)elf->len) { \ 985 if (offset >= (Elf ## B ## _Off)elf->len) { \
958 ++dyn; \ 986 ++dyn; \
959 continue; \ 987 continue; \
960 } \ 988 } \
961 soname = (char*)(elf->data + offset); \ 989 soname = elf->data + offset; \
962 *found_soname = 1; \ 990 *found_soname = 1; \
963 return (be_wewy_wewy_quiet ? NULL : soname); \ 991 return (be_wewy_wewy_quiet ? NULL : soname); \
964 } \ 992 } \
965 ++dyn; \ 993 ++dyn; \
966 } \ 994 } \
970 } 998 }
971 999
972 return NULL; 1000 return NULL;
973} 1001}
974 1002
1003/*
1004 * We support the symbol form:
1005 * [%[modifiers]%][[+-]<symbol name>][,[.....]]
1006 * If the symbol name is empty, then all symbols are matched.
1007 * If the symbol name is a glob ("*"), then all symbols are dumped (debug).
1008 * Do not rely on this output format at all.
1009 * Otherwise the symbol name is used to search (either regex or string compare).
1010 * If the first char of the symbol name is a plus ("+"), then only match
1011 * defined symbols. If it's a minus ("-"), only match undefined symbols.
1012 * Putting modifiers in between the percent signs allows for more in depth
1013 * filters. There are groups of modifiers. If you don't specify a member
1014 * of a group, then all types in that group are matched. The current
1015 * groups and their types are:
1016 * STT group: STT_NOTYPE:n STT_OBJECT:o STT_FUNC:f SST_FILE:F
1017 * STB group: STB_LOCAL:l STB_GLOBAL:g STB_WEAK:w
1018 * SHN group: SHN_UNDEF:u SHN_ABS:a SHN_COMMON:c {defined}:d
1019 * The "defined" value in the SHN group does not correspond to a SHN_xxx define.
1020 * You can search for multiple symbols at once by seperating with a comma (",").
1021 *
1022 * Some examples:
1023 * ELFs with a weak function "foo":
1024 * scanelf -s %wf%foo <ELFs>
1025 * ELFs that define the symbol "main":
1026 * scanelf -s +main <ELFs>
1027 * scanelf -s %d%main <ELFs>
1028 * ELFs that refer to the undefined symbol "brk":
1029 * scanelf -s -brk <ELFs>
1030 * scanelf -s %u%brk <ELFs>
1031 * All global defined objects in an ELF:
1032 * scanelf -s %ogd% <ELF>
1033 */
1034static void
1035scanelf_match_symname(elfobj *elf, char *found_sym, char **ret, size_t *ret_len, const char *symname,
1036 unsigned int stt, unsigned int stb, unsigned int shn, unsigned long size)
1037{
1038 char *this_sym, *next_sym, saved = saved;
1039
1040 /* allow the user to specify a comma delimited list of symbols to search for */
1041 next_sym = NULL;
1042 do {
1043 bool inc_notype, inc_object, inc_func, inc_file,
1044 inc_local, inc_global, inc_weak,
1045 inc_def, inc_undef, inc_abs, inc_common;
1046
1047 if (next_sym) {
1048 next_sym[-1] = saved;
1049 this_sym = next_sym;
1050 } else
1051 this_sym = find_sym;
1052 if ((next_sym = strchr(this_sym, ','))) {
1053 /* make parsing easier by killing the comma temporarily */
1054 saved = *next_sym;
1055 *next_sym = '\0';
1056 next_sym += 1;
1057 }
1058
1059 /* symbol selection! */
1060 inc_notype = inc_object = inc_func = inc_file = \
1061 inc_local = inc_global = inc_weak = \
1062 inc_def = inc_undef = inc_abs = inc_common = \
1063 (*this_sym != '%');
1064
1065 /* parse the contents of %...% */
1066 if (!inc_notype) {
1067 while (*(this_sym++)) {
1068 if (*this_sym == '%') {
1069 ++this_sym;
1070 break;
1071 }
1072 switch (*this_sym) {
1073 case 'n': inc_notype = true; break;
1074 case 'o': inc_object = true; break;
1075 case 'f': inc_func = true; break;
1076 case 'F': inc_file = true; break;
1077 case 'l': inc_local = true; break;
1078 case 'g': inc_global = true; break;
1079 case 'w': inc_weak = true; break;
1080 case 'd': inc_def = true; break;
1081 case 'u': inc_undef = true; break;
1082 case 'a': inc_abs = true; break;
1083 case 'c': inc_common = true; break;
1084 default: err("invalid symbol selector '%c'", *this_sym);
1085 }
1086 }
1087
1088 /* If no types are matched, not match all */
1089 if (!inc_notype && !inc_object && !inc_func && !inc_file)
1090 inc_notype = inc_object = inc_func = inc_file = true;
1091 if (!inc_local && !inc_global && !inc_weak)
1092 inc_local = inc_global = inc_weak = true;
1093 if (!inc_def && !inc_undef && !inc_abs && !inc_common)
1094 inc_def = inc_undef = inc_abs = inc_common = true;
1095
1096 /* backwards compat for defined/undefined short hand */
1097 } else if (*this_sym == '+') {
1098 inc_undef = false;
1099 ++this_sym;
1100 } else if (*this_sym == '-') {
1101 inc_def = inc_abs = inc_common = false;
1102 ++this_sym;
1103 }
1104
1105 /* filter symbols */
1106 if ((!inc_notype && stt == STT_NOTYPE) || \
1107 (!inc_object && stt == STT_OBJECT) || \
1108 (!inc_func && stt == STT_FUNC ) || \
1109 (!inc_file && stt == STT_FILE ) || \
1110 (!inc_local && stb == STB_LOCAL ) || \
1111 (!inc_global && stb == STB_GLOBAL) || \
1112 (!inc_weak && stb == STB_WEAK ) || \
1113 (!inc_def && shn && shn < SHN_LORESERVE) || \
1114 (!inc_undef && shn == SHN_UNDEF ) || \
1115 (!inc_abs && shn == SHN_ABS ) || \
1116 (!inc_common && shn == SHN_COMMON))
1117 continue;
1118
1119 if (*this_sym == '*') {
1120 /* a "*" symbol gets you debug output */
1121 printf("%s(%s) %5lX %15s %15s %15s %s\n",
1122 ((*found_sym == 0) ? "\n\t" : "\t"),
1123 elf->base_filename,
1124 size,
1125 get_elfstttype(stt),
1126 get_elfstbtype(stb),
1127 get_elfshntype(shn),
1128 symname);
1129 goto matched;
1130
1131 } else {
1132 if (g_match) {
1133 /* regex match the symbol */
1134 if (rematch(this_sym, symname, REG_EXTENDED) != 0)
1135 continue;
1136
1137 } else if (*this_sym) {
1138 /* give empty symbols a "pass", else do a normal compare */
1139 const size_t len = strlen(this_sym);
1140 if (!(strncmp(this_sym, symname, len) == 0 &&
1141 /* Accept unversioned symbol names */
1142 (symname[len] == '\0' || symname[len] == '@')))
1143 continue;
1144 }
1145
1146 if (be_semi_verbose) {
1147 char buf[1024];
1148 snprintf(buf, sizeof(buf), "%lX %s %s",
1149 size,
1150 get_elfstttype(stt),
1151 this_sym);
1152 *ret = xstrdup(buf);
1153 } else {
1154 if (*ret) xchrcat(ret, ',', ret_len);
1155 xstrcat(ret, symname, ret_len);
1156 }
1157
1158 goto matched;
1159 }
1160 } while (next_sym);
1161
1162 return;
1163
1164 matched:
1165 *found_sym = 1;
1166 if (next_sym)
1167 next_sym[-1] = saved;
1168}
1169
975static char *scanelf_file_sym(elfobj *elf, char *found_sym) 1170static const char *scanelf_file_sym(elfobj *elf, char *found_sym)
976{ 1171{
977 unsigned long i; 1172 unsigned long i;
978 char *ret; 1173 char *ret;
979 void *symtab_void, *strtab_void; 1174 void *symtab_void, *strtab_void;
980 1175
981 if (!find_sym) return NULL; 1176 if (!find_sym) return NULL;
982 ret = find_sym; 1177 ret = NULL;
983 1178
984 scanelf_file_get_symtabs(elf, &symtab_void, &strtab_void); 1179 scanelf_file_get_symtabs(elf, &symtab_void, &strtab_void);
985 1180
986 if (symtab_void && strtab_void) { 1181 if (symtab_void && strtab_void) {
987#define FIND_SYM(B) \ 1182#define FIND_SYM(B) \
988 if (elf->elf_class == ELFCLASS ## B) { \ 1183 if (elf->elf_class == ELFCLASS ## B) { \
989 Elf ## B ## _Shdr *symtab = SHDR ## B (symtab_void); \ 1184 Elf ## B ## _Shdr *symtab = SHDR ## B (symtab_void); \
990 Elf ## B ## _Shdr *strtab = SHDR ## B (strtab_void); \ 1185 Elf ## B ## _Shdr *strtab = SHDR ## B (strtab_void); \
991 Elf ## B ## _Sym *sym = SYM ## B (elf->data + EGET(symtab->sh_offset)); \ 1186 Elf ## B ## _Sym *sym = SYM ## B (elf->vdata + EGET(symtab->sh_offset)); \
992 unsigned long cnt = EGET(symtab->sh_entsize); \ 1187 unsigned long cnt = EGET(symtab->sh_entsize); \
993 char *symname; \ 1188 char *symname; \
1189 size_t ret_len = 0; \
994 if (cnt) \ 1190 if (cnt) \
995 cnt = EGET(symtab->sh_size) / cnt; \ 1191 cnt = EGET(symtab->sh_size) / cnt; \
996 for (i = 0; i < cnt; ++i) { \ 1192 for (i = 0; i < cnt; ++i) { \
1193 if ((void*)sym > elf->data_end) { \
1194 warnf("%s: corrupt ELF symbols - aborting", elf->filename); \
1195 goto break_out; \
1196 } \
997 if (sym->st_name) { \ 1197 if (sym->st_name) { \
998 /* make sure the symbol name is in acceptable memory range */ \ 1198 /* make sure the symbol name is in acceptable memory range */ \
999 symname = (char *)(elf->data + EGET(strtab->sh_offset) + EGET(sym->st_name)); \ 1199 symname = elf->data + EGET(strtab->sh_offset) + EGET(sym->st_name); \
1000 if ((void*)symname > (void*)elf->data_end) { \ 1200 if ((void*)symname > elf->data_end) { \
1001 warnf("%s: corrupt ELF symbols", elf->filename); \ 1201 warnf("%s: corrupt ELF symbols", elf->filename); \
1002 ++sym; \ 1202 ++sym; \
1003 continue; \ 1203 continue; \
1004 } \ 1204 } \
1005 /* debug display ... show all symbols and some extra info */ \ 1205 scanelf_match_symname(elf, found_sym, \
1006 if (g_match ? rematch(ret, symname, REG_EXTENDED) == 0 : *ret == '*') { \ 1206 &ret, &ret_len, symname, \
1007 printf("%s(%s) %5lX %15s %s %s\n", \ 1207 ELF##B##_ST_TYPE(EGET(sym->st_info)), \
1008 ((*found_sym == 0) ? "\n\t" : "\t"), \ 1208 ELF##B##_ST_BIND(EGET(sym->st_info)), \
1009 elf->base_filename, \ 1209 EGET(sym->st_shndx), \
1010 (unsigned long)sym->st_size, \ 1210 /* st_size can be 64bit, but no one is really that big, so screw em */ \
1011 get_elfstttype(sym->st_info), \ 1211 EGET(sym->st_size)); \
1012 sym->st_shndx == SHN_UNDEF ? "U" : "D", symname); \
1013 *found_sym = 1; \
1014 } else { \
1015 /* allow the user to specify a comma delimited list of symbols to search for */ \
1016 char *this_sym, *this_sym_ver, *next_sym; \
1017 this_sym = ret; \
1018 this_sym_ver = versioned_symname; \
1019 do { \
1020 next_sym = strchr(this_sym, ','); \
1021 if (next_sym == NULL) \
1022 next_sym = this_sym + strlen(this_sym); \
1023 /* do we want a defined symbol ? */ \
1024 if (*this_sym == '+') { \
1025 if (sym->st_shndx == SHN_UNDEF) \
1026 goto skip_this_sym##B; \
1027 ++this_sym; \
1028 ++this_sym_ver; \
1029 /* do we want an undefined symbol ? */ \
1030 } else if (*this_sym == '-') { \
1031 if (sym->st_shndx != SHN_UNDEF) \
1032 goto skip_this_sym##B; \
1033 ++this_sym; \
1034 ++this_sym_ver; \
1035 } \
1036 /* ok, lets compare the name now */ \
1037 if ((strncmp(this_sym, symname, (next_sym-this_sym)) == 0 && symname[next_sym-this_sym] == '\0') || \
1038 (strncmp(this_sym_ver, symname, strlen(this_sym_ver)) == 0)) { \
1039 if (be_semi_verbose) { \
1040 char buf[126]; \
1041 snprintf(buf, sizeof(buf), "%lX %s %s", \
1042 (unsigned long)sym->st_size, get_elfstttype(sym->st_info), this_sym); \
1043 ret = buf; \
1044 } else \
1045 ret = this_sym; \
1046 (*found_sym)++; \
1047 goto break_out; \
1048 } \
1049 skip_this_sym##B: this_sym = next_sym + 1; \
1050 } while (*next_sym != '\0'); \
1051 } \
1052 } \ 1212 } \
1053 ++sym; \ 1213 ++sym; \
1054 } } 1214 } }
1055 FIND_SYM(32) 1215 FIND_SYM(32)
1056 FIND_SYM(64) 1216 FIND_SYM(64)
1062 if (*find_sym != '*' && *found_sym) 1222 if (*find_sym != '*' && *found_sym)
1063 return ret; 1223 return ret;
1064 if (be_quiet) 1224 if (be_quiet)
1065 return NULL; 1225 return NULL;
1066 else 1226 else
1067 return (char *)" - "; 1227 return " - ";
1068} 1228}
1069 1229
1070
1071static char *scanelf_file_sections(elfobj *elf, char *found_section) 1230static const char *scanelf_file_sections(elfobj *elf, char *found_section)
1072{ 1231{
1073 if (!find_section) 1232 if (!find_section)
1074 return NULL; 1233 return NULL;
1075 1234
1076#define FIND_SECTION(B) \ 1235#define FIND_SECTION(B) \
1077 if (elf->elf_class == ELFCLASS ## B) { \ 1236 if (elf->elf_class == ELFCLASS ## B) { \
1237 size_t matched, n; \
1078 int invert; \ 1238 int invert; \
1239 const char *section_name; \
1079 Elf ## B ## _Shdr *section; \ 1240 Elf ## B ## _Shdr *section; \
1241 \
1242 matched = 0; \
1243 array_for_each(find_section_arr, n, section_name) { \
1080 invert = (*find_section == '!' ? 1 : 0); \ 1244 invert = (*section_name == '!' ? 1 : 0); \
1081 section = SHDR ## B (elf_findsecbyname(elf, find_section+invert)); \ 1245 section = SHDR ## B (elf_findsecbyname(elf, section_name + invert)); \
1082 if ((section == NULL && invert) || (section != NULL && !invert)) \ 1246 if ((section == NULL && invert) || (section != NULL && !invert)) \
1247 ++matched; \
1248 } \
1249 \
1250 if (matched == array_cnt(find_section_arr)) \
1083 *found_section = 1; \ 1251 *found_section = 1; \
1084 } 1252 }
1085 FIND_SECTION(32) 1253 FIND_SECTION(32)
1086 FIND_SECTION(64) 1254 FIND_SECTION(64)
1087 1255
1092 return find_section; 1260 return find_section;
1093 1261
1094 if (be_quiet) 1262 if (be_quiet)
1095 return NULL; 1263 return NULL;
1096 else 1264 else
1097 return (char *)" - "; 1265 return " - ";
1098} 1266}
1099 1267
1100/* scan an elf file and show all the fun stuff */ 1268/* scan an elf file and show all the fun stuff */
1101#define prints(str) write(fileno(stdout), str, strlen(str)) 1269#define prints(str) ({ ssize_t ret = write(fileno(stdout), str, strlen(str)); ret; })
1102static int scanelf_elfobj(elfobj *elf) 1270static int scanelf_elfobj(elfobj *elf)
1103{ 1271{
1104 unsigned long i; 1272 unsigned long i;
1105 char found_pax, found_phdr, found_relro, found_load, found_textrel, 1273 char found_pax, found_phdr, found_relro, found_load, found_textrel,
1106 found_rpath, found_needed, found_interp, found_bind, found_soname, 1274 found_rpath, found_needed, found_interp, found_bind, found_soname,
1120 printf("%s: scanning file\n", elf->filename); 1288 printf("%s: scanning file\n", elf->filename);
1121 1289
1122 /* init output buffer */ 1290 /* init output buffer */
1123 if (!out_buffer) { 1291 if (!out_buffer) {
1124 out_len = sizeof(char) * 80; 1292 out_len = sizeof(char) * 80;
1125 out_buffer = (char*)xmalloc(out_len); 1293 out_buffer = xmalloc(out_len);
1126 } 1294 }
1127 *out_buffer = '\0'; 1295 *out_buffer = '\0';
1128 1296
1129 /* show the header */ 1297 /* show the header */
1130 if (!be_quiet && show_banner) { 1298 if (!be_quiet && show_banner) {
1145 case 'r': prints("RPATH "); break; 1313 case 'r': prints("RPATH "); break;
1146 case 'M': prints("CLASS "); break; 1314 case 'M': prints("CLASS "); break;
1147 case 'n': prints("NEEDED "); break; 1315 case 'n': prints("NEEDED "); break;
1148 case 'i': prints("INTERP "); break; 1316 case 'i': prints("INTERP "); break;
1149 case 'b': prints("BIND "); break; 1317 case 'b': prints("BIND "); break;
1318 case 'Z': prints("SIZE "); break;
1150 case 'S': prints("SONAME "); break; 1319 case 'S': prints("SONAME "); break;
1151 case 's': prints("SYM "); break; 1320 case 's': prints("SYM "); break;
1152 case 'N': prints("LIB "); break; 1321 case 'N': prints("LIB "); break;
1153 case 'T': prints("TEXTRELS "); break; 1322 case 'T': prints("TEXTRELS "); break;
1154 case 'k': prints("SECTION "); break; 1323 case 'k': prints("SECTION "); break;
1155 case 'a': prints("ARCH "); break; 1324 case 'a': prints("ARCH "); break;
1325 case 'I': prints("OSABI "); break;
1326 case 'Y': prints("EABI "); break;
1156 case 'O': prints("PERM "); break; 1327 case 'O': prints("PERM "); break;
1157 case 'D': prints("ENDIAN "); break; 1328 case 'D': prints("ENDIAN "); break;
1158 default: warnf("'%c' has no title ?", out_format[i]); 1329 default: warnf("'%c' has no title ?", out_format[i]);
1159 } 1330 }
1160 } 1331 }
1166 1337
1167 /* dump all the good stuff */ 1338 /* dump all the good stuff */
1168 for (i = 0; out_format[i]; ++i) { 1339 for (i = 0; out_format[i]; ++i) {
1169 const char *out; 1340 const char *out;
1170 const char *tmp; 1341 const char *tmp;
1171 1342 static char ubuf[sizeof(unsigned long)*2];
1172 if (!IS_MODIFIER(out_format[i])) { 1343 if (!IS_MODIFIER(out_format[i])) {
1173 xchrcat(&out_buffer, out_format[i], &out_len); 1344 xchrcat(&out_buffer, out_format[i], &out_len);
1174 continue; 1345 continue;
1175 } 1346 }
1176 1347
1214 case 't': out = scanelf_file_textrel(elf, &found_textrel); break; 1385 case 't': out = scanelf_file_textrel(elf, &found_textrel); break;
1215 case 'T': out = scanelf_file_textrels(elf, &found_textrels, &found_textrel); break; 1386 case 'T': out = scanelf_file_textrels(elf, &found_textrels, &found_textrel); break;
1216 case 'r': scanelf_file_rpath(elf, &found_rpath, &out_buffer, &out_len); break; 1387 case 'r': scanelf_file_rpath(elf, &found_rpath, &out_buffer, &out_len); break;
1217 case 'M': out = get_elfeitype(EI_CLASS, elf->data[EI_CLASS]); break; 1388 case 'M': out = get_elfeitype(EI_CLASS, elf->data[EI_CLASS]); break;
1218 case 'D': out = get_endian(elf); break; 1389 case 'D': out = get_endian(elf); break;
1219 case 'O': out = getstr_perms(elf->filename); break; 1390 case 'O': out = strfileperms(elf->filename); break;
1220 case 'n': 1391 case 'n':
1221 case 'N': out = scanelf_file_needed_lib(elf, &found_needed, &found_lib, (out_format[i]=='N'), &out_buffer, &out_len); break; 1392 case 'N': out = scanelf_file_needed_lib(elf, &found_needed, &found_lib, (out_format[i]=='N'), &out_buffer, &out_len); break;
1222 case 'i': out = scanelf_file_interp(elf, &found_interp); break; 1393 case 'i': out = scanelf_file_interp(elf, &found_interp); break;
1223 case 'b': out = scanelf_file_bind(elf, &found_bind); break; 1394 case 'b': out = scanelf_file_bind(elf, &found_bind); break;
1224 case 'S': out = scanelf_file_soname(elf, &found_soname); break; 1395 case 'S': out = scanelf_file_soname(elf, &found_soname); break;
1225 case 's': out = scanelf_file_sym(elf, &found_sym); break; 1396 case 's': out = scanelf_file_sym(elf, &found_sym); break;
1226 case 'k': out = scanelf_file_sections(elf, &found_section); break; 1397 case 'k': out = scanelf_file_sections(elf, &found_section); break;
1227 case 'a': out = get_elfemtype(elf); break; 1398 case 'a': out = get_elfemtype(elf); break;
1399 case 'I': out = get_elfosabi(elf); break;
1400 case 'Y': out = get_elf_eabi(elf); break;
1401 case 'Z': snprintf(ubuf, sizeof(ubuf), "%lu", (unsigned long)elf->len); out = ubuf; break;;
1228 default: warnf("'%c' has no scan code?", out_format[i]); 1402 default: warnf("'%c' has no scan code?", out_format[i]);
1229 } 1403 }
1230 if (out) { 1404 if (out)
1231 /* hack for comma delimited output like `scanelf -s sym1,sym2,sym3` */
1232 if (out_format[i] == 's' && (tmp=strchr(out,',')) != NULL)
1233 xstrncat(&out_buffer, out, &out_len, (tmp-out));
1234 else
1235 xstrcat(&out_buffer, out, &out_len); 1405 xstrcat(&out_buffer, out, &out_len);
1236 }
1237 } 1406 }
1238 1407
1239#define FOUND_SOMETHING() \ 1408#define FOUND_SOMETHING() \
1240 (found_pax || found_phdr || found_relro || found_load || found_textrel || \ 1409 (found_pax || found_phdr || found_relro || found_load || found_textrel || \
1241 found_rpath || found_needed || found_interp || found_bind || \ 1410 found_rpath || found_needed || found_interp || found_bind || \
1278 if (strlen(match_etypes)) { 1447 if (strlen(match_etypes)) {
1279 char sbuf[126]; 1448 char sbuf[126];
1280 strncpy(sbuf, match_etypes, sizeof(sbuf)); 1449 strncpy(sbuf, match_etypes, sizeof(sbuf));
1281 if (strchr(match_etypes, ',') != NULL) { 1450 if (strchr(match_etypes, ',') != NULL) {
1282 char *p; 1451 char *p;
1283 while((p = strrchr(sbuf, ',')) != NULL) { 1452 while ((p = strrchr(sbuf, ',')) != NULL) {
1284 *p = 0; 1453 *p = 0;
1285 if (etype_lookup(p+1) == get_etype(elf)) 1454 if (etype_lookup(p+1) == get_etype(elf))
1286 goto label_ret; 1455 goto label_ret;
1287 } 1456 }
1288 } 1457 }
1308 1477
1309 ar = ar_open_fd(filename, fd); 1478 ar = ar_open_fd(filename, fd);
1310 if (ar == NULL) 1479 if (ar == NULL)
1311 return 1; 1480 return 1;
1312 1481
1313 ar_buffer = (char*)mmap(0, len, PROT_READ | (fix_elf ? PROT_WRITE : 0), (fix_elf ? MAP_SHARED : MAP_PRIVATE), fd, 0); 1482 ar_buffer = mmap(0, len, PROT_READ | (fix_elf ? PROT_WRITE : 0), (fix_elf ? MAP_SHARED : MAP_PRIVATE), fd, 0);
1314 while ((m=ar_next(ar)) != NULL) { 1483 while ((m = ar_next(ar)) != NULL) {
1484 off_t cur_pos = lseek(fd, 0, SEEK_CUR);
1485 if (cur_pos == -1)
1486 errp("lseek() failed");
1315 elf = readelf_buffer(m->name, ar_buffer+lseek(fd,0,SEEK_CUR), m->size); 1487 elf = readelf_buffer(m->name, ar_buffer + cur_pos, m->size);
1316 if (elf) { 1488 if (elf) {
1317 scanelf_elfobj(elf); 1489 scanelf_elfobj(elf);
1318 unreadelf(elf); 1490 unreadelf(elf);
1319 } 1491 }
1320 } 1492 }
1354 1526
1355 close(fd); 1527 close(fd);
1356 return 0; 1528 return 0;
1357} 1529}
1358 1530
1531static const char *maybe_add_root(const char *fname, char *buf)
1532{
1533 if (root && strncmp(fname, root, strlen(root))) {
1534 strcpy(buf, root);
1535 strncat(buf, fname, __PAX_UTILS_PATH_MAX - strlen(root) - 1);
1536 fname = buf;
1537 }
1538 return fname;
1539}
1540
1359/* scan a directory for ET_EXEC files and print when we find one */ 1541/* scan a directory for ET_EXEC files and print when we find one */
1360static int scanelf_dir(const char *path) 1542static int scanelf_dir(const char *path)
1361{ 1543{
1362 register DIR *dir; 1544 register DIR *dir;
1363 register struct dirent *dentry; 1545 register struct dirent *dentry;
1364 struct stat st_top, st; 1546 struct stat st_top, st;
1365 char buf[__PAX_UTILS_PATH_MAX]; 1547 char buf[__PAX_UTILS_PATH_MAX];
1548 char _path[__PAX_UTILS_PATH_MAX];
1366 size_t pathlen = 0, len = 0; 1549 size_t pathlen = 0, len = 0;
1367 int ret = 0; 1550 int ret = 0;
1551
1552 path = maybe_add_root(path, _path);
1368 1553
1369 /* make sure path exists */ 1554 /* make sure path exists */
1370 if (lstat(path, &st_top) == -1) { 1555 if (lstat(path, &st_top) == -1) {
1371 if (be_verbose > 2) printf("%s: does not exist\n", path); 1556 if (be_verbose > 2) printf("%s: does not exist\n", path);
1372 return 1; 1557 return 1;
1436static int load_ld_cache_config(int i, const char *fname) 1621static int load_ld_cache_config(int i, const char *fname)
1437{ 1622{
1438 FILE *fp = NULL; 1623 FILE *fp = NULL;
1439 char *p; 1624 char *p;
1440 char path[__PAX_UTILS_PATH_MAX]; 1625 char path[__PAX_UTILS_PATH_MAX];
1626 char _fname[__PAX_UTILS_PATH_MAX];
1627
1628 fname = maybe_add_root(fname, _fname);
1441 1629
1442 if (i + 1 == ARRAY_SIZE(ldpaths)) 1630 if (i + 1 == ARRAY_SIZE(ldpaths))
1443 return i; 1631 return i;
1444 1632
1445 if ((fp = fopen(fname, "r")) == NULL) 1633 if ((fp = fopen(fname, "r")) == NULL)
1448 while ((fgets(path, __PAX_UTILS_PATH_MAX, fp)) != NULL) { 1636 while ((fgets(path, __PAX_UTILS_PATH_MAX, fp)) != NULL) {
1449 if ((p = strrchr(path, '\r')) != NULL) 1637 if ((p = strrchr(path, '\r')) != NULL)
1450 *p = 0; 1638 *p = 0;
1451 if ((p = strchr(path, '\n')) != NULL) 1639 if ((p = strchr(path, '\n')) != NULL)
1452 *p = 0; 1640 *p = 0;
1453#ifdef __linux__ 1641
1454 // recursive includes of the same file will make this segfault. 1642 /* recursive includes of the same file will make this segfault. */
1455 if ((memcmp(path, "include", 7) == 0) && isblank(path[7])) { 1643 if ((memcmp(path, "include", 7) == 0) && isblank(path[7])) {
1456 glob64_t gl; 1644 glob_t gl;
1457 size_t x; 1645 size_t x;
1458 char gpath[__PAX_UTILS_PATH_MAX]; 1646 char gpath[__PAX_UTILS_PATH_MAX];
1459 1647
1460 memset(gpath, 0, sizeof(gpath)); 1648 memset(gpath, 0, sizeof(gpath));
1649 if (root)
1650 strcpy(gpath, root);
1461 1651
1462 if (path[8] != '/') 1652 if (path[8] != '/')
1463 snprintf(gpath, sizeof(gpath), "/etc/%s", &path[8]); 1653 snprintf(gpath+strlen(gpath), sizeof(gpath)-strlen(gpath), "/etc/%s", &path[8]);
1464 else 1654 else
1465 strncpy(gpath, &path[8], sizeof(gpath)); 1655 strncpy(gpath+strlen(gpath), &path[8], sizeof(gpath)-strlen(gpath));
1466 1656
1467 if ((glob64(gpath, 0, NULL, &gl)) == 0) { 1657 if (glob(gpath, 0, NULL, &gl) == 0) {
1468 for (x = 0; x < gl.gl_pathc; ++x) { 1658 for (x = 0; x < gl.gl_pathc; ++x) {
1469 /* try to avoid direct loops */ 1659 /* try to avoid direct loops */
1470 if (strcmp(gl.gl_pathv[x], fname) == 0) 1660 if (strcmp(gl.gl_pathv[x], fname) == 0)
1471 continue; 1661 continue;
1472 i = load_ld_cache_config(i, gl.gl_pathv[x]); 1662 i = load_ld_cache_config(i, gl.gl_pathv[x]);
1473 if (i + 1 >= ARRAY_SIZE(ldpaths)) { 1663 if (i + 1 >= ARRAY_SIZE(ldpaths)) {
1474 globfree64(&gl); 1664 globfree(&gl);
1475 return i; 1665 return i;
1476 } 1666 }
1477 } 1667 }
1478 globfree64 (&gl); 1668 globfree(&gl);
1479 continue; 1669 continue;
1480 } 1670 }
1481 } 1671 }
1482#endif 1672
1483 if (*path != '/') 1673 if (*path != '/')
1484 continue; 1674 continue;
1485 1675
1486 ldpaths[i++] = xstrdup(path); 1676 ldpaths[i++] = xstrdup(path);
1487 1677
1492 1682
1493 fclose(fp); 1683 fclose(fp);
1494 return i; 1684 return i;
1495} 1685}
1496 1686
1497#elif defined(__FreeBSD__) || (__DragonFly__) 1687#elif defined(__FreeBSD__) || defined(__DragonFly__)
1498 1688
1499static int load_ld_cache_config(int i, const char *fname) 1689static int load_ld_cache_config(int i, const char *fname)
1500{ 1690{
1501 FILE *fp = NULL; 1691 FILE *fp = NULL;
1502 char *b = NULL, *p; 1692 char *b = NULL, *p;
1503 struct elfhints_hdr hdr; 1693 struct elfhints_hdr hdr;
1694 char _fname[__PAX_UTILS_PATH_MAX];
1695
1696 fname = maybe_add_root(fname, _fname);
1504 1697
1505 if (i + 1 == ARRAY_SIZE(ldpaths)) 1698 if (i + 1 == ARRAY_SIZE(ldpaths))
1506 return i; 1699 return i;
1507 1700
1508 if ((fp = fopen(fname, "r")) == NULL) 1701 if ((fp = fopen(fname, "r")) == NULL)
1514 { 1707 {
1515 fclose(fp); 1708 fclose(fp);
1516 return i; 1709 return i;
1517 } 1710 }
1518 1711
1519 b = (char*)malloc(hdr.dirlistlen+1); 1712 b = xmalloc(hdr.dirlistlen + 1);
1520 if (fread(b, 1, hdr.dirlistlen+1, fp) != hdr.dirlistlen+1) { 1713 if (fread(b, 1, hdr.dirlistlen+1, fp) != hdr.dirlistlen+1) {
1521 fclose(fp); 1714 fclose(fp);
1522 free(b); 1715 free(b);
1523 return i; 1716 return i;
1524 } 1717 }
1536 fclose(fp); 1729 fclose(fp);
1537 return i; 1730 return i;
1538} 1731}
1539 1732
1540#else 1733#else
1541 1734#ifdef __ELF__
1542#warning Cache config support not implemented for your target 1735#warning Cache config support not implemented for your target
1736#endif
1543static int load_ld_cache_config(int i, const char *fname) 1737static int load_ld_cache_config(int i, const char *fname)
1544{ 1738{
1545 memset(ldpaths, 0x00, sizeof(ldpaths)); 1739 memset(ldpaths, 0x00, sizeof(ldpaths));
1740 return 0;
1546} 1741}
1547
1548#endif 1742#endif
1549 1743
1550/* scan /etc/ld.so.conf for paths */ 1744/* scan /etc/ld.so.conf for paths */
1551static void scanelf_ldpath(void) 1745static void scanelf_ldpath(void)
1552{ 1746{
1557 err("Unable to load any paths from ld.so.conf"); 1751 err("Unable to load any paths from ld.so.conf");
1558 1752
1559 scan_l = scan_ul = scan_ull = 0; 1753 scan_l = scan_ul = scan_ull = 0;
1560 1754
1561 while (ldpaths[i]) { 1755 while (ldpaths[i]) {
1562 if (!scan_l && !strcmp(ldpaths[i], "/lib")) scan_l = 1; 1756 if (!scan_l && !strcmp(ldpaths[i], "/lib")) scan_l = 1;
1563 if (!scan_ul && !strcmp(ldpaths[i], "/usr/lib")) scan_ul = 1; 1757 if (!scan_ul && !strcmp(ldpaths[i], "/usr/lib")) scan_ul = 1;
1564 if (!scan_ull && !strcmp(ldpaths[i], "/usr/local/lib")) scan_ull = 1; 1758 if (!scan_ull && !strcmp(ldpaths[i], "/usr/local/lib")) scan_ull = 1;
1565 scanelf_dir(ldpaths[i]); 1759 scanelf_dir(ldpaths[i]);
1566 ++i; 1760 ++i;
1567 } 1761 }
1568 1762
1587 } 1781 }
1588 1782
1589 free(path); 1783 free(path);
1590} 1784}
1591 1785
1592
1593/* usage / invocation handling functions */ /* Free Flags: c d j u w C G H I J K P Q U W Y Z */ 1786/* usage / invocation handling functions */ /* Free Flags: c d j u w G H J K P Q U W */
1594#define PARSE_FLAGS "plRmyAXz:xetrnLibSs:k:gN:TaqvF:f:o:E:M:DO:BhV" 1787#define PARSE_FLAGS "plRmyAXz:xetrnLibSs:k:gN:TaqvF:f:o:E:M:DIYO:ZCBhV"
1595#define a_argument required_argument 1788#define a_argument required_argument
1596static struct option const long_opts[] = { 1789static struct option const long_opts[] = {
1597 {"path", no_argument, NULL, 'p'}, 1790 {"path", no_argument, NULL, 'p'},
1598 {"ldpath", no_argument, NULL, 'l'}, 1791 {"ldpath", no_argument, NULL, 'l'},
1792 {"root", a_argument, NULL, 128},
1599 {"recursive", no_argument, NULL, 'R'}, 1793 {"recursive", no_argument, NULL, 'R'},
1600 {"mount", no_argument, NULL, 'm'}, 1794 {"mount", no_argument, NULL, 'm'},
1601 {"symlink", no_argument, NULL, 'y'}, 1795 {"symlink", no_argument, NULL, 'y'},
1602 {"archives", no_argument, NULL, 'A'}, 1796 {"archives", no_argument, NULL, 'A'},
1603 {"ldcache", no_argument, NULL, 'L'}, 1797 {"ldcache", no_argument, NULL, 'L'},
1617 {"gmatch", no_argument, NULL, 'g'}, 1811 {"gmatch", no_argument, NULL, 'g'},
1618 {"textrels", no_argument, NULL, 'T'}, 1812 {"textrels", no_argument, NULL, 'T'},
1619 {"etype", a_argument, NULL, 'E'}, 1813 {"etype", a_argument, NULL, 'E'},
1620 {"bits", a_argument, NULL, 'M'}, 1814 {"bits", a_argument, NULL, 'M'},
1621 {"endian", no_argument, NULL, 'D'}, 1815 {"endian", no_argument, NULL, 'D'},
1816 {"osabi", no_argument, NULL, 'I'},
1817 {"eabi", no_argument, NULL, 'Y'},
1622 {"perms", a_argument, NULL, 'O'}, 1818 {"perms", a_argument, NULL, 'O'},
1819 {"size", no_argument, NULL, 'Z'},
1623 {"all", no_argument, NULL, 'a'}, 1820 {"all", no_argument, NULL, 'a'},
1624 {"quiet", no_argument, NULL, 'q'}, 1821 {"quiet", no_argument, NULL, 'q'},
1625 {"verbose", no_argument, NULL, 'v'}, 1822 {"verbose", no_argument, NULL, 'v'},
1626 {"format", a_argument, NULL, 'F'}, 1823 {"format", a_argument, NULL, 'F'},
1627 {"from", a_argument, NULL, 'f'}, 1824 {"from", a_argument, NULL, 'f'},
1628 {"file", a_argument, NULL, 'o'}, 1825 {"file", a_argument, NULL, 'o'},
1826 {"nocolor", no_argument, NULL, 'C'},
1629 {"nobanner", no_argument, NULL, 'B'}, 1827 {"nobanner", no_argument, NULL, 'B'},
1630 {"help", no_argument, NULL, 'h'}, 1828 {"help", no_argument, NULL, 'h'},
1631 {"version", no_argument, NULL, 'V'}, 1829 {"version", no_argument, NULL, 'V'},
1632 {NULL, no_argument, NULL, 0x0} 1830 {NULL, no_argument, NULL, 0x0}
1633}; 1831};
1634 1832
1635static const char *opts_help[] = { 1833static const char * const opts_help[] = {
1636 "Scan all directories in PATH environment", 1834 "Scan all directories in PATH environment",
1637 "Scan all directories in /etc/ld.so.conf", 1835 "Scan all directories in /etc/ld.so.conf",
1836 "Root directory (use with -l or -p)",
1638 "Scan directories recursively", 1837 "Scan directories recursively",
1639 "Don't recursively cross mount points", 1838 "Don't recursively cross mount points",
1640 "Don't scan symlinks", 1839 "Don't scan symlinks",
1641 "Scan archives (.a files)", 1840 "Scan archives (.a files)",
1642 "Utilize ld.so.cache information (use with -r/-n)", 1841 "Utilize ld.so.cache information (use with -r/-n)",
1651 "Print BIND information", 1850 "Print BIND information",
1652 "Print SONAME information", 1851 "Print SONAME information",
1653 "Find a specified symbol", 1852 "Find a specified symbol",
1654 "Find a specified section", 1853 "Find a specified section",
1655 "Find a specified library", 1854 "Find a specified library",
1656 "Use strncmp to match libraries. (use with -N)", 1855 "Use regex matching rather than string compare (use with -s)",
1657 "Locate cause of TEXTREL", 1856 "Locate cause of TEXTREL",
1658 "Print only ELF files matching etype ET_DYN,ET_EXEC ...", 1857 "Print only ELF files matching etype ET_DYN,ET_EXEC ...",
1659 "Print only ELF files matching numeric bits", 1858 "Print only ELF files matching numeric bits",
1660 "Print Endianness", 1859 "Print Endianness",
1860 "Print OSABI",
1861 "Print EABI (EM_ARM Only)",
1661 "Print only ELF files matching octal permissions", 1862 "Print only ELF files matching octal permissions",
1662 "Print all scanned info (-x -e -t -r -b)\n", 1863 "Print ELF file size",
1864 "Print all useful/simple info\n",
1663 "Only output 'bad' things", 1865 "Only output 'bad' things",
1664 "Be verbose (can be specified more than once)", 1866 "Be verbose (can be specified more than once)",
1665 "Use specified format for output", 1867 "Use specified format for output",
1666 "Read input stream from a filename", 1868 "Read input stream from a filename",
1667 "Write output stream to a filename", 1869 "Write output stream to a filename",
1870 "Don't emit color in output",
1668 "Don't display the header", 1871 "Don't display the header",
1669 "Print this help and exit", 1872 "Print this help and exit",
1670 "Print version and exit", 1873 "Print version and exit",
1671 NULL 1874 NULL
1672}; 1875};
1679 "Usage: %s [options] <dir1/file1> [dir2 dirN file2 fileN ...]\n\n", argv0); 1882 "Usage: %s [options] <dir1/file1> [dir2 dirN file2 fileN ...]\n\n", argv0);
1680 printf("Options: -[%s]\n", PARSE_FLAGS); 1883 printf("Options: -[%s]\n", PARSE_FLAGS);
1681 for (i = 0; long_opts[i].name; ++i) 1884 for (i = 0; long_opts[i].name; ++i)
1682 if (long_opts[i].has_arg == no_argument) 1885 if (long_opts[i].has_arg == no_argument)
1683 printf(" -%c, --%-14s* %s\n", long_opts[i].val, 1886 printf(" -%c, --%-14s* %s\n", long_opts[i].val,
1887 long_opts[i].name, opts_help[i]);
1888 else if (long_opts[i].val > '~')
1889 printf(" --%-7s <arg> * %s\n",
1684 long_opts[i].name, opts_help[i]); 1890 long_opts[i].name, opts_help[i]);
1685 else 1891 else
1686 printf(" -%c, --%-7s <arg> * %s\n", long_opts[i].val, 1892 printf(" -%c, --%-7s <arg> * %s\n", long_opts[i].val,
1687 long_opts[i].name, opts_help[i]); 1893 long_opts[i].name, opts_help[i]);
1688 1894
1731 if (strcmp(optarg, "ELFCLASS64") == 0) 1937 if (strcmp(optarg, "ELFCLASS64") == 0)
1732 match_bits = 64; 1938 match_bits = 64;
1733 } 1939 }
1734 break; 1940 break;
1735 case 'O': 1941 case 'O':
1736 if (sscanf(optarg, "%o", &match_perms) == (-1)) 1942 if (sscanf(optarg, "%o", &match_perms) == -1)
1737 match_bits = 0; 1943 match_bits = 0;
1738 break; 1944 break;
1739 case 'o': { 1945 case 'o': {
1740 if (freopen(optarg, "w", stdout) == NULL) 1946 if (freopen(optarg, "w", stdout) == NULL)
1741 err("Could not open output stream '%s': %s", optarg, strerror(errno)); 1947 err("Could not open output stream '%s': %s", optarg, strerror(errno));
1742 break; 1948 break;
1743 } 1949 }
1744 case 'k': 1950 case 'k':
1745 if (find_section) warn("You prob don't want to specify -k twice"); 1951 xarraypush(find_section_arr, optarg, strlen(optarg));
1746 find_section = optarg;
1747 break; 1952 break;
1748 case 's': { 1953 case 's': {
1749 if (find_sym) warn("You prob don't want to specify -s twice"); 1954 if (find_sym) warn("You prob don't want to specify -s twice");
1750 find_sym = optarg; 1955 find_sym = optarg;
1751 versioned_symname = (char*)xmalloc(sizeof(char) * (strlen(find_sym)+1+1));
1752 sprintf(versioned_symname, "%s@", find_sym);
1753 break; 1956 break;
1754 } 1957 }
1755 case 'N': { 1958 case 'N':
1756 if (find_lib) warn("You prob don't want to specify -N twice"); 1959 xarraypush(find_lib_arr, optarg, strlen(optarg));
1757 find_lib = optarg;
1758 break; 1960 break;
1759 }
1760
1761 case 'F': { 1961 case 'F': {
1762 if (out_format) warn("You prob don't want to specify -F twice"); 1962 if (out_format) warn("You prob don't want to specify -F twice");
1763 out_format = optarg; 1963 out_format = optarg;
1764 break; 1964 break;
1765 } 1965 }
1766 case 'z': { 1966 case 'z': {
1767 unsigned long flags = (PF_NOEMUTRAMP | PF_NORANDEXEC); 1967 unsigned long flags = (PF_NOEMUTRAMP | PF_NORANDEXEC);
1768 size_t x; 1968 size_t x;
1769 1969
1770 for (x = 0 ; x < strlen(optarg); x++) { 1970 for (x = 0; x < strlen(optarg); x++) {
1771 switch(optarg[x]) { 1971 switch (optarg[x]) {
1772 case 'p': 1972 case 'p':
1773 case 'P': 1973 case 'P':
1774 do_pax_state(optarg[x], PAGEEXEC); 1974 do_pax_state(optarg[x], PAGEEXEC);
1775 break; 1975 break;
1776 case 's': 1976 case 's':
1804 ((flags & PF_EMUTRAMP) && (flags & PF_NOEMUTRAMP)) || 2004 ((flags & PF_EMUTRAMP) && (flags & PF_NOEMUTRAMP)) ||
1805 ((flags & PF_RANDMMAP) && (flags & PF_NORANDMMAP)))) 2005 ((flags & PF_RANDMMAP) && (flags & PF_NORANDMMAP))))
1806 setpax = flags; 2006 setpax = flags;
1807 break; 2007 break;
1808 } 2008 }
2009 case 'Z': show_size = 1; break;
1809 case 'g': g_match = 1; break; 2010 case 'g': g_match = 1; break;
1810 case 'L': use_ldcache = 1; break; 2011 case 'L': use_ldcache = 1; break;
1811 case 'y': scan_symlink = 0; break; 2012 case 'y': scan_symlink = 0; break;
1812 case 'A': scan_archives = 1; break; 2013 case 'A': scan_archives = 1; break;
2014 case 'C': color_init(true); break;
1813 case 'B': show_banner = 0; break; 2015 case 'B': show_banner = 0; break;
1814 case 'l': scan_ldpath = 1; break; 2016 case 'l': scan_ldpath = 1; break;
1815 case 'p': scan_envpath = 1; break; 2017 case 'p': scan_envpath = 1; break;
1816 case 'R': dir_recurse = 1; break; 2018 case 'R': dir_recurse = 1; break;
1817 case 'm': dir_crossmount = 0; break; 2019 case 'm': dir_crossmount = 0; break;
1827 case 'T': show_textrels = 1; break; 2029 case 'T': show_textrels = 1; break;
1828 case 'q': be_quiet = 1; break; 2030 case 'q': be_quiet = 1; break;
1829 case 'v': be_verbose = (be_verbose % 20) + 1; break; 2031 case 'v': be_verbose = (be_verbose % 20) + 1; break;
1830 case 'a': show_perms = show_pax = show_phdr = show_textrel = show_rpath = show_bind = show_endian = 1; break; 2032 case 'a': show_perms = show_pax = show_phdr = show_textrel = show_rpath = show_bind = show_endian = 1; break;
1831 case 'D': show_endian = 1; break; 2033 case 'D': show_endian = 1; break;
2034 case 'I': show_osabi = 1; break;
2035 case 'Y': show_eabi = 1; break;
2036 case 128:
2037 root = optarg;
2038 break;
1832 case ':': 2039 case ':':
1833 err("Option '%c' is missing parameter", optopt); 2040 err("Option '%c' is missing parameter", optopt);
1834 case '?': 2041 case '?':
1835 err("Unknown option '%c' or argument missing", optopt); 2042 err("Unknown option '%c' or argument missing", optopt);
1836 default: 2043 default:
1839 } 2046 }
1840 if (show_textrels && be_verbose) { 2047 if (show_textrels && be_verbose) {
1841 if (which("objdump") != NULL) 2048 if (which("objdump") != NULL)
1842 has_objdump = 1; 2049 has_objdump = 1;
1843 } 2050 }
2051 /* flatten arrays for display */
2052 if (array_cnt(find_lib_arr))
2053 find_lib = array_flatten_str(find_lib_arr);
2054 if (array_cnt(find_section_arr))
2055 find_section = array_flatten_str(find_section_arr);
1844 /* let the format option override all other options */ 2056 /* let the format option override all other options */
1845 if (out_format) { 2057 if (out_format) {
1846 show_pax = show_phdr = show_textrel = show_rpath = \ 2058 show_pax = show_phdr = show_textrel = show_rpath = \
1847 show_needed = show_interp = show_bind = show_soname = \ 2059 show_needed = show_interp = show_bind = show_soname = \
1848 show_textrels = show_perms = show_endian = 0; 2060 show_textrels = show_perms = show_endian = show_size = \
2061 show_osabi = show_eabi = 0;
1849 for (i = 0; out_format[i]; ++i) { 2062 for (i = 0; out_format[i]; ++i) {
1850 if (!IS_MODIFIER(out_format[i])) continue; 2063 if (!IS_MODIFIER(out_format[i])) continue;
1851 2064
1852 switch (out_format[++i]) { 2065 switch (out_format[++i]) {
1853 case '+': break; 2066 case '+': break;
1860 case 's': break; 2073 case 's': break;
1861 case 'N': break; 2074 case 'N': break;
1862 case 'o': break; 2075 case 'o': break;
1863 case 'a': break; 2076 case 'a': break;
1864 case 'M': break; 2077 case 'M': break;
2078 case 'Z': show_size = 1; break;
1865 case 'D': show_endian = 1; break; 2079 case 'D': show_endian = 1; break;
2080 case 'I': show_osabi = 1; break;
2081 case 'Y': show_eabi = 1; break;
1866 case 'O': show_perms = 1; break; 2082 case 'O': show_perms = 1; break;
1867 case 'x': show_pax = 1; break; 2083 case 'x': show_pax = 1; break;
1868 case 'e': show_phdr = 1; break; 2084 case 'e': show_phdr = 1; break;
1869 case 't': show_textrel = 1; break; 2085 case 't': show_textrel = 1; break;
1870 case 'r': show_rpath = 1; break; 2086 case 'r': show_rpath = 1; break;
1880 } 2096 }
1881 2097
1882 /* construct our default format */ 2098 /* construct our default format */
1883 } else { 2099 } else {
1884 size_t fmt_len = 30; 2100 size_t fmt_len = 30;
1885 out_format = (char*)xmalloc(sizeof(char) * fmt_len); 2101 out_format = xmalloc(sizeof(char) * fmt_len);
2102 *out_format = '\0';
1886 if (!be_quiet) xstrcat(&out_format, "%o ", &fmt_len); 2103 if (!be_quiet) xstrcat(&out_format, "%o ", &fmt_len);
1887 if (show_pax) xstrcat(&out_format, "%x ", &fmt_len); 2104 if (show_pax) xstrcat(&out_format, "%x ", &fmt_len);
1888 if (show_perms) xstrcat(&out_format, "%O ", &fmt_len); 2105 if (show_perms) xstrcat(&out_format, "%O ", &fmt_len);
2106 if (show_size) xstrcat(&out_format, "%Z ", &fmt_len);
1889 if (show_endian) xstrcat(&out_format, "%D ", &fmt_len); 2107 if (show_endian) xstrcat(&out_format, "%D ", &fmt_len);
2108 if (show_osabi) xstrcat(&out_format, "%I ", &fmt_len);
2109 if (show_eabi) xstrcat(&out_format, "%Y ", &fmt_len);
1890 if (show_phdr) xstrcat(&out_format, "%e ", &fmt_len); 2110 if (show_phdr) xstrcat(&out_format, "%e ", &fmt_len);
1891 if (show_textrel) xstrcat(&out_format, "%t ", &fmt_len); 2111 if (show_textrel) xstrcat(&out_format, "%t ", &fmt_len);
1892 if (show_rpath) xstrcat(&out_format, "%r ", &fmt_len); 2112 if (show_rpath) xstrcat(&out_format, "%r ", &fmt_len);
1893 if (show_needed) xstrcat(&out_format, "%n ", &fmt_len); 2113 if (show_needed) xstrcat(&out_format, "%n ", &fmt_len);
1894 if (show_interp) xstrcat(&out_format, "%i ", &fmt_len); 2114 if (show_interp) xstrcat(&out_format, "%i ", &fmt_len);
1919 search_path = argv[optind++]; 2139 search_path = argv[optind++];
1920 ret = scanelf_dir(search_path); 2140 ret = scanelf_dir(search_path);
1921 } 2141 }
1922 2142
1923 /* clean up */ 2143 /* clean up */
1924 free(versioned_symname);
1925 for (i = 0; ldpaths[i]; ++i) 2144 for (i = 0; ldpaths[i]; ++i)
1926 free(ldpaths[i]); 2145 free(ldpaths[i]);
2146 free(find_lib);
2147 free(find_section);
1927 2148
1928 if (ldcache != 0) 2149 if (ldcache != 0)
1929 munmap(ldcache, ldcache_size); 2150 munmap(ldcache, ldcache_size);
1930 return ret; 2151 return ret;
1931} 2152}
1964 return envvals; 2185 return envvals;
1965} 2186}
1966 2187
1967static void parseenv(void) 2188static void parseenv(void)
1968{ 2189{
2190 color_init(false);
1969 qa_textrels = get_split_env("QA_TEXTRELS"); 2191 qa_textrels = get_split_env("QA_TEXTRELS");
1970 qa_execstack = get_split_env("QA_EXECSTACK"); 2192 qa_execstack = get_split_env("QA_EXECSTACK");
1971 qa_wx_load = get_split_env("QA_WX_LOAD"); 2193 qa_wx_load = get_split_env("QA_WX_LOAD");
1972} 2194}
1973 2195
1978 free(qa_textrels); 2200 free(qa_textrels);
1979 free(qa_execstack); 2201 free(qa_execstack);
1980 free(qa_wx_load); 2202 free(qa_wx_load);
1981} 2203}
1982#endif 2204#endif
1983
1984 2205
1985int main(int argc, char *argv[]) 2206int main(int argc, char *argv[])
1986{ 2207{
1987 int ret; 2208 int ret;
1988 if (argc < 2) 2209 if (argc < 2)
1997 "\t- 1 per QA_TEXTRELS/QA_EXECSTACK/QA_WX_LOAD"); 2218 "\t- 1 per QA_TEXTRELS/QA_EXECSTACK/QA_WX_LOAD");
1998#endif 2219#endif
1999 return ret; 2220 return ret;
2000} 2221}
2001 2222
2002
2003
2004/* utility funcs */
2005static char *xstrdup(const char *s)
2006{
2007 char *ret = strdup(s);
2008 if (!ret) err("Could not strdup(): %s", strerror(errno));
2009 return ret;
2010}
2011static void *xmalloc(size_t size)
2012{
2013 void *ret = malloc(size);
2014 if (!ret) err("Could not malloc() %li bytes", (unsigned long)size);
2015 return ret;
2016}
2017static void *xrealloc(void *ptr, size_t size)
2018{
2019 void *ret = realloc(ptr, size);
2020 if (!ret) err("Could not realloc() %li bytes", (unsigned long)size);
2021 return ret;
2022}
2023static void xstrncat(char **dst, const char *src, size_t *curr_len, size_t n)
2024{
2025 size_t new_len;
2026
2027 new_len = strlen(*dst) + strlen(src);
2028 if (*curr_len <= new_len) {
2029 *curr_len = new_len + (*curr_len / 2);
2030 *dst = realloc(*dst, *curr_len);
2031 if (!*dst)
2032 err("could not realloc() %li bytes", (unsigned long)*curr_len);
2033 }
2034
2035 if (n)
2036 strncat(*dst, src, n);
2037 else
2038 strcat(*dst, src);
2039}
2040static inline void xchrcat(char **dst, const char append, size_t *curr_len)
2041{
2042 static char my_app[2];
2043 my_app[0] = append;
2044 my_app[1] = '\0';
2045 xstrcat(dst, my_app, curr_len);
2046}
2047
2048/* Match filename against entries in matchlist, return TRUE 2223/* Match filename against entries in matchlist, return TRUE
2049 * if the file is listed */ 2224 * if the file is listed */
2050static int file_matches_list(const char *filename, char **matchlist) 2225static int file_matches_list(const char *filename, char **matchlist)
2051{ 2226{
2052 char **file; 2227 char **file;

Legend:
Removed from v.1.185  
changed lines
  Added in v.1.226

  ViewVC Help
Powered by ViewVC 1.1.20