/[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.254
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.254 2013/04/02 21:13:05 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.254 2013/04/02 21:13:05 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 == '+')
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 int has_objdump = 0;
71 74
72/* find the path to a file by name */ 75/* find the path to a file by name */
73static char *which(const char *fname) 76static int bin_in_path(const char *fname)
74{ 77{
75 static char fullpath[__PAX_UTILS_PATH_MAX]; 78 char fullpath[__PAX_UTILS_PATH_MAX];
76 char *path, *p; 79 char *path, *p;
77 80
78 path = getenv("PATH"); 81 path = getenv("PATH");
79 if (!path) 82 if (!path)
80 return NULL; 83 return 0;
81 84
82 path = xstrdup(path);
83 while ((p = strrchr(path, ':')) != NULL) { 85 while ((p = strrchr(path, ':')) != NULL) {
84 snprintf(fullpath, sizeof(fullpath), "%s/%s", p + 1, fname); 86 snprintf(fullpath, sizeof(fullpath), "%s/%s", p + 1, fname);
85 *p = 0; 87 *p = 0;
86 if (access(fullpath, R_OK) != -1) { 88 if (access(fullpath, R_OK) != -1)
87 free(path); 89 return 1;
88 return fullpath;
89 } 90 }
90 } 91
91 free(path); 92 return 0;
93}
94
95static FILE *fopenat_r(int dir_fd, const char *path)
96{
97 int fd = openat(dir_fd, path, O_RDONLY|O_CLOEXEC);
98 if (fd == -1)
92 return NULL; 99 return NULL;
100 return fdopen(fd, "re");
93} 101}
94 102
95/* 1 on failure. 0 otherwise */ 103static const char *root_rel_path(const char *path)
96static int rematch(const char *regex, const char *match, int cflags)
97{ 104{
98 regex_t preg; 105 /*
99 int ret; 106 * openat() will ignore the dirfd if path starts with
100 107 * a /, so consume all of that noise
101 if ((match == NULL) || (regex == NULL)) 108 *
102 return EXIT_FAILURE; 109 * XXX: we don't handle relative paths like ../ that
103 110 * break out of the --root option, but for now, just
104 if ((ret = regcomp(&preg, regex, cflags))) { 111 * don't do that :P.
105 char err[256]; 112 */
106 113 if (root_fd != AT_FDCWD) {
107 if (regerror(ret, &preg, err, sizeof(err))) 114 while (*path == '/')
108 fprintf(stderr, "regcomp failed: %s", err); 115 ++path;
109 else 116 if (*path == '\0')
110 fprintf(stderr, "regcomp failed"); 117 path = ".";
111
112 return EXIT_FAILURE;
113 } 118 }
114 ret = regexec(&preg, match, 0, NULL, 0);
115 regfree(&preg);
116 119
117 return ret; 120 return path;
118} 121}
119 122
120/* sub-funcs for scanelf_file() */ 123/* sub-funcs for scanelf_fileat() */
121static void scanelf_file_get_symtabs(elfobj *elf, void **sym, void **tab) 124static void scanelf_file_get_symtabs(elfobj *elf, void **sym, void **str)
122{ 125{
123 /* find the best SHT_DYNSYM and SHT_STRTAB sections */ 126 /* find the best SHT_DYNSYM and SHT_STRTAB sections */
124 127
125 /* debug sections */ 128 /* debug sections */
126 void *symtab = elf_findsecbyname(elf, ".symtab"); 129 void *symtab = elf_findsecbyname(elf, ".symtab");
127 void *strtab = elf_findsecbyname(elf, ".strtab"); 130 void *strtab = elf_findsecbyname(elf, ".strtab");
128 /* runtime sections */ 131 /* runtime sections */
129 void *dynsym = elf_findsecbyname(elf, ".dynsym"); 132 void *dynsym = elf_findsecbyname(elf, ".dynsym");
130 void *dynstr = elf_findsecbyname(elf, ".dynstr"); 133 void *dynstr = elf_findsecbyname(elf, ".dynstr");
131 134
135 /*
136 * If the sections are marked NOBITS, then they don't exist, so we just
137 * skip them. This let's us work sanely with splitdebug ELFs (rather
138 * than spewing a lot of "corrupt ELF" messages later on). In malformed
139 * ELFs, the section might be wrongly set to NOBITS, but screw em.
140 */
132#define GET_SYMTABS(B) \ 141#define GET_SYMTABS(B) \
133 if (elf->elf_class == ELFCLASS ## B) { \ 142 if (elf->elf_class == ELFCLASS ## B) { \
134 if (symtab && dynsym) { \
135 Elf ## B ## _Shdr *esymtab = symtab; \ 143 Elf ## B ## _Shdr *esymtab = symtab; \
144 Elf ## B ## _Shdr *estrtab = strtab; \
136 Elf ## B ## _Shdr *edynsym = dynsym; \ 145 Elf ## B ## _Shdr *edynsym = dynsym; \
146 Elf ## B ## _Shdr *edynstr = dynstr; \
147 \
148 if (symtab && EGET(esymtab->sh_type) == SHT_NOBITS) \
149 symtab = NULL; \
150 if (dynsym && EGET(edynsym->sh_type) == SHT_NOBITS) \
151 dynsym = NULL; \
152 if (symtab && dynsym) \
137 *sym = (EGET(esymtab->sh_size) > EGET(edynsym->sh_size)) ? symtab : dynsym; \ 153 *sym = (EGET(esymtab->sh_size) > EGET(edynsym->sh_size)) ? symtab : dynsym; \
138 } else \ 154 else \
139 *sym = symtab ? symtab : dynsym; \ 155 *sym = symtab ? symtab : dynsym; \
156 \
157 if (strtab && EGET(estrtab->sh_type) == SHT_NOBITS) \
158 strtab = NULL; \
159 if (dynstr && EGET(edynstr->sh_type) == SHT_NOBITS) \
160 dynstr = NULL; \
140 if (strtab && dynstr) { \ 161 if (strtab && dynstr) \
141 Elf ## B ## _Shdr *estrtab = strtab; \
142 Elf ## B ## _Shdr *edynstr = dynstr; \
143 *tab = (EGET(estrtab->sh_size) > EGET(edynstr->sh_size)) ? strtab : dynstr; \ 162 *str = (EGET(estrtab->sh_size) > EGET(edynstr->sh_size)) ? strtab : dynstr; \
144 } else \ 163 else \
145 *tab = strtab ? strtab : dynstr; \ 164 *str = strtab ? strtab : dynstr; \
146 } 165 }
147 GET_SYMTABS(32) 166 GET_SYMTABS(32)
148 GET_SYMTABS(64) 167 GET_SYMTABS(64)
168
169 if (*sym && *str)
170 return;
171
172 /*
173 * damn, they're really going to make us work for it huh?
174 * reconstruct the section header info out of the dynamic
175 * tags so we can see what symbols this guy uses at runtime.
176 */
177#define GET_SYMTABS_DT(B) \
178 if (elf->elf_class == ELFCLASS ## B) { \
179 size_t i; \
180 static Elf ## B ## _Shdr sym_shdr, str_shdr; \
181 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
182 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \
183 Elf ## B ## _Addr vsym, vstr, vhash, vgnu_hash; \
184 Elf ## B ## _Dyn *dyn; \
185 Elf ## B ## _Off offset; \
186 \
187 /* lookup symbols used at runtime with DT_SYMTAB / DT_STRTAB */ \
188 vsym = vstr = vhash = vgnu_hash = 0; \
189 memset(&sym_shdr, 0, sizeof(sym_shdr)); \
190 memset(&str_shdr, 0, sizeof(str_shdr)); \
191 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
192 if (EGET(phdr[i].p_type) != PT_DYNAMIC) \
193 continue; \
194 \
195 offset = EGET(phdr[i].p_offset); \
196 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) \
197 continue; \
198 \
199 dyn = DYN ## B (elf->vdata + offset); \
200 while (EGET(dyn->d_tag) != DT_NULL) { \
201 switch (EGET(dyn->d_tag)) { \
202 case DT_SYMTAB: vsym = EGET(dyn->d_un.d_val); break; \
203 case DT_SYMENT: sym_shdr.sh_entsize = dyn->d_un.d_val; break; \
204 case DT_STRTAB: vstr = EGET(dyn->d_un.d_val); break; \
205 case DT_STRSZ: str_shdr.sh_size = dyn->d_un.d_val; break; \
206 case DT_HASH: vhash = EGET(dyn->d_un.d_val); break; \
207 /*case DT_GNU_HASH: vgnu_hash = EGET(dyn->d_un.d_val); break;*/ \
208 } \
209 ++dyn; \
210 } \
211 if (vsym && vstr) \
212 break; \
213 } \
214 if (!vsym || !vstr || !(vhash || vgnu_hash)) \
215 return; \
216 \
217 /* calc offset into the ELF by finding the load addr of the syms */ \
218 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
219 Elf ## B ## _Addr vaddr = EGET(phdr[i].p_vaddr); \
220 Elf ## B ## _Addr filesz = EGET(phdr[i].p_filesz); \
221 offset = EGET(phdr[i].p_offset); \
222 \
223 if (EGET(phdr[i].p_type) != PT_LOAD) \
224 continue; \
225 \
226 if (vhash >= vaddr && vhash < vaddr + filesz) { \
227 /* Scan the hash table to see how many entries we have */ \
228 Elf32_Word max_sym_idx = 0; \
229 Elf32_Word *hashtbl = elf->vdata + offset + (vhash - vaddr); \
230 Elf32_Word b, nbuckets = EGET(hashtbl[0]); \
231 Elf32_Word nchains = EGET(hashtbl[1]); \
232 Elf32_Word *buckets = &hashtbl[2]; \
233 Elf32_Word *chains = &buckets[nbuckets]; \
234 Elf32_Word sym_idx; \
235 \
236 for (b = 0; b < nbuckets; ++b) { \
237 if (!buckets[b]) \
238 continue; \
239 for (sym_idx = buckets[b]; sym_idx < nchains && sym_idx; sym_idx = chains[sym_idx]) \
240 if (max_sym_idx < sym_idx) \
241 max_sym_idx = sym_idx; \
242 } \
243 ESET(sym_shdr.sh_size, sym_shdr.sh_entsize * max_sym_idx); \
244 } \
245 \
246 if (vsym >= vaddr && vsym < vaddr + filesz) { \
247 ESET(sym_shdr.sh_offset, offset + (vsym - vaddr)); \
248 *sym = &sym_shdr; \
249 } \
250 \
251 if (vstr >= vaddr && vstr < vaddr + filesz) { \
252 ESET(str_shdr.sh_offset, offset + (vstr - vaddr)); \
253 *str = &str_shdr; \
254 } \
255 } \
256 }
257 GET_SYMTABS_DT(32)
258 GET_SYMTABS_DT(64)
149} 259}
150 260
151static char *scanelf_file_pax(elfobj *elf, char *found_pax) 261static char *scanelf_file_pax(elfobj *elf, char *found_pax)
152{ 262{
153 static char ret[7]; 263 static char ret[7];
180 } 290 }
181 SHOW_PAX(32) 291 SHOW_PAX(32)
182 SHOW_PAX(64) 292 SHOW_PAX(64)
183 } 293 }
184 294
185 if (fix_elf && setpax) { 295 /* Note: We do not support setting EI_PAX if not PT_PAX_FLAGS
186 /* set the chpax settings */ 296 * was found. This is known to break ELFs on glibc systems,
187 if (elf->elf_class == ELFCLASS32) { 297 * 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) 298 * We could support changing PT_GNU_STACK, but that doesn't
189 ESET(EHDR32(elf->ehdr)->e_ident[EI_PAX], pax_pf2hf_flags(setpax)); 299 * seem like it's worth the effort. #411919
190 } else { 300 */
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 301
196 /* fall back to EI_PAX if no PT_PAX was found */ 302 /* fall back to EI_PAX if no PT_PAX was found */
197 if (!*ret) { 303 if (!*ret) {
198 static char *paxflags; 304 static char *paxflags;
199 paxflags = pax_short_hf_flags(EI_PAX_FLAGS(elf)); 305 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) 319static char *scanelf_file_phdr(elfobj *elf, char *found_phdr, char *found_relro, char *found_load)
214{ 320{
215 static char ret[12]; 321 static char ret[12];
216 char *found; 322 char *found;
217 unsigned long i, shown, multi_stack, multi_relro, multi_load; 323 unsigned long i, shown, multi_stack, multi_relro, multi_load;
218 int max_pt_load;
219 324
220 if (!show_phdr) return NULL; 325 if (!show_phdr) return NULL;
221 326
222 memcpy(ret, "--- --- ---\0", 12); 327 memcpy(ret, "--- --- ---\0", 12);
223 328
224 shown = 0; 329 shown = 0;
225 multi_stack = multi_relro = multi_load = 0; 330 multi_stack = multi_relro = multi_load = 0;
226 max_pt_load = elf_max_pt_load(elf);
227 331
228#define NOTE_GNU_STACK ".note.GNU-stack" 332#define NOTE_GNU_STACK ".note.GNU-stack"
229#define SHOW_PHDR(B) \ 333#define SHOW_PHDR(B) \
230 if (elf->elf_class == ELFCLASS ## B) { \ 334 if (elf->elf_class == ELFCLASS ## B) { \
231 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \ 335 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
247 warnf("%s: multiple PT_GNU_RELRO's !?", elf->filename); \ 351 warnf("%s: multiple PT_GNU_RELRO's !?", elf->filename); \
248 found = found_relro; \ 352 found = found_relro; \
249 offset = 4; \ 353 offset = 4; \
250 check_flags = PF_X; \ 354 check_flags = PF_X; \
251 } else if (EGET(phdr[i].p_type) == PT_LOAD) { \ 355 } 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)) \ 356 if (file_matches_list(elf->filename, qa_wx_load)) \
256 continue; \ 357 continue; \
257 found = found_load; \ 358 found = found_load; \
258 offset = 8; \ 359 offset = 8; \
259 check_flags = PF_W|PF_X; \ 360 check_flags = PF_W|PF_X; \
467 printf(" [0x%lX]\n", (unsigned long)offset_tmp); \ 568 printf(" [0x%lX]\n", (unsigned long)offset_tmp); \
468 if (be_verbose && has_objdump) { \ 569 if (be_verbose && has_objdump) { \
469 Elf ## B ## _Addr end_addr = offset_tmp + EGET(func->st_size); \ 570 Elf ## B ## _Addr end_addr = offset_tmp + EGET(func->st_size); \
470 char *sysbuf; \ 571 char *sysbuf; \
471 size_t syslen; \ 572 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"; \ 573 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"; \
474 syslen = sizeof(sysfmt) + strlen(elf->filename) + 3 * sizeof(unsigned long) + 1; \ 574 syslen = sizeof(sysfmt) + strlen(elf->filename) + 3 * sizeof(unsigned long) + 1; \
475 sysbuf = xmalloc(syslen); \ 575 sysbuf = xmalloc(syslen); \
476 if (end_addr < r_offset) \ 576 if (end_addr < r_offset) \
477 /* not uncommon when things are optimized out */ \ 577 /* not uncommon when things are optimized out */ \
480 (unsigned long)offset_tmp, \ 580 (unsigned long)offset_tmp, \
481 (unsigned long)end_addr, \ 581 (unsigned long)end_addr, \
482 elf->filename, \ 582 elf->filename, \
483 (unsigned long)r_offset); \ 583 (unsigned long)r_offset); \
484 fflush(stdout); \ 584 fflush(stdout); \
485 sysret = system(sysbuf); \ 585 if (system(sysbuf)) /* don't care */; \
486 fflush(stdout); \ 586 fflush(stdout); \
487 free(sysbuf); \ 587 free(sysbuf); \
488 } \ 588 } \
489 } \ 589 } \
490 } } 590 } }
663 xstrcat(ret, (runpath ? runpath : rpath), ret_len); 763 xstrcat(ret, (runpath ? runpath : rpath), ret_len);
664 else if (!be_quiet) 764 else if (!be_quiet)
665 xstrcat(ret, " - ", ret_len); 765 xstrcat(ret, " - ", ret_len);
666} 766}
667 767
768/* Defines can be seen in glibc's sysdeps/generic/ldconfig.h */
668#define LDSO_CACHE_MAGIC "ld.so-" 769#define LDSO_CACHE_MAGIC "ld.so-"
669#define LDSO_CACHE_MAGIC_LEN (sizeof LDSO_CACHE_MAGIC -1) 770#define LDSO_CACHE_MAGIC_LEN (sizeof LDSO_CACHE_MAGIC -1)
670#define LDSO_CACHE_VER "1.7.0" 771#define LDSO_CACHE_VER "1.7.0"
671#define LDSO_CACHE_VER_LEN (sizeof LDSO_CACHE_VER -1) 772#define LDSO_CACHE_VER_LEN (sizeof LDSO_CACHE_VER -1)
672#define FLAG_ANY -1 773#define FLAG_ANY -1
681#define FLAG_X8664_LIB64 0x0300 782#define FLAG_X8664_LIB64 0x0300
682#define FLAG_S390_LIB64 0x0400 783#define FLAG_S390_LIB64 0x0400
683#define FLAG_POWERPC_LIB64 0x0500 784#define FLAG_POWERPC_LIB64 0x0500
684#define FLAG_MIPS64_LIBN32 0x0600 785#define FLAG_MIPS64_LIBN32 0x0600
685#define FLAG_MIPS64_LIBN64 0x0700 786#define FLAG_MIPS64_LIBN64 0x0700
787#define FLAG_X8664_LIBX32 0x0800
788#define FLAG_ARM_LIBHF 0x0900
789#define FLAG_AARCH64_LIB64 0x0a00
686 790
687#if defined(__GLIBC__) || defined(__UCLIBC__) 791#if defined(__GLIBC__) || defined(__UCLIBC__)
688 792
689static char *lookup_cache_lib(elfobj *elf, char *fname) 793static char *lookup_cache_lib(elfobj *elf, const char *fname)
690{ 794{
691 int fd; 795 int fd;
692 char *strs; 796 char *strs;
693 static char buf[__PAX_UTILS_PATH_MAX] = ""; 797 static char buf[__PAX_UTILS_PATH_MAX] = "";
694 const char cachefile[] = "/etc/ld.so.cache"; 798 const char *cachefile = root_rel_path("/etc/ld.so.cache");
695 struct stat st; 799 struct stat st;
696 800
697 typedef struct { 801 typedef struct {
698 char magic[LDSO_CACHE_MAGIC_LEN]; 802 char magic[LDSO_CACHE_MAGIC_LEN];
699 char version[LDSO_CACHE_VER_LEN]; 803 char version[LDSO_CACHE_VER_LEN];
710 814
711 if (fname == NULL) 815 if (fname == NULL)
712 return NULL; 816 return NULL;
713 817
714 if (ldcache == NULL) { 818 if (ldcache == NULL) {
715 if (stat(cachefile, &st)) 819 if (fstatat(root_fd, cachefile, &st, 0))
716 return NULL; 820 return NULL;
717 821
718 fd = open(cachefile, O_RDONLY); 822 fd = openat(root_fd, cachefile, O_RDONLY);
719 if (fd == -1) 823 if (fd == -1)
720 return NULL; 824 return NULL;
721 825
722 /* cache these values so we only map/unmap the cache file once */ 826 /* cache these values so we only map/unmap the cache file once */
723 ldcache_size = st.st_size; 827 ldcache_size = st.st_size;
762 866
763 return buf; 867 return buf;
764} 868}
765 869
766#elif defined(__NetBSD__) 870#elif defined(__NetBSD__)
767static char *lookup_cache_lib(elfobj *elf, char *fname) 871static char *lookup_cache_lib(elfobj *elf, const char *fname)
768{ 872{
769 static char buf[__PAX_UTILS_PATH_MAX] = ""; 873 static char buf[__PAX_UTILS_PATH_MAX] = "";
770 static struct stat st; 874 static struct stat st;
771 size_t n; 875 size_t n;
772 char *ldpath; 876 char *ldpath;
791} 895}
792#else 896#else
793#ifdef __ELF__ 897#ifdef __ELF__
794#warning Cache support not implemented for your target 898#warning Cache support not implemented for your target
795#endif 899#endif
796static char *lookup_cache_lib(elfobj *elf, char *fname) 900static char *lookup_cache_lib(elfobj *elf, const char *fname)
797{ 901{
798 return NULL; 902 return NULL;
799} 903}
800#endif 904#endif
905
906static char *lookup_config_lib(elfobj *elf, char *fname)
907{
908 static char buf[__PAX_UTILS_PATH_MAX] = "";
909 const char *ldpath;
910 size_t n;
911
912 array_for_each(ldpaths, n, ldpath) {
913 snprintf(buf, sizeof(buf), "%s/%s", root_rel_path(ldpath), fname);
914 if (faccessat(root_fd, buf, F_OK, AT_SYMLINK_NOFOLLOW) == 0)
915 return buf;
916 }
917
918 return NULL;
919}
801 920
802static const char *scanelf_file_needed_lib(elfobj *elf, char *found_needed, char *found_lib, int op, char **ret, size_t *ret_len) 921static const char *scanelf_file_needed_lib(elfobj *elf, char *found_needed, char *found_lib, int op, char **ret, size_t *ret_len)
803{ 922{
804 unsigned long i; 923 unsigned long i;
805 char *needed; 924 char *needed;
843 needed = elf->data + offset; \ 962 needed = elf->data + offset; \
844 if (op == 0) { \ 963 if (op == 0) { \
845 /* -n -> print all entries */ \ 964 /* -n -> print all entries */ \
846 if (!be_wewy_wewy_quiet) { \ 965 if (!be_wewy_wewy_quiet) { \
847 if (*found_needed) xchrcat(ret, ',', ret_len); \ 966 if (*found_needed) xchrcat(ret, ',', ret_len); \
848 if (use_ldcache) \ 967 if (use_ldpath) { \
968 if ((p = lookup_config_lib(elf, needed)) != NULL) \
969 needed = p; \
970 } else if (use_ldcache) { \
849 if ((p = lookup_cache_lib(elf, needed)) != NULL) \ 971 if ((p = lookup_cache_lib(elf, needed)) != NULL) \
850 needed = p; \ 972 needed = p; \
973 } \
851 xstrcat(ret, needed, ret_len); \ 974 xstrcat(ret, needed, ret_len); \
852 } \ 975 } \
853 *found_needed = 1; \ 976 *found_needed = 1; \
854 } else { \ 977 } else { \
855 /* -N -> print matching entries */ \ 978 /* -N -> print matching entries */ \
856 size_t n; \ 979 size_t n; \
857 const char *find_lib_name; \ 980 const char *find_lib_name; \
858 \ 981 \
859 array_for_each(find_lib_arr, n, find_lib_name) \ 982 array_for_each(find_lib_arr, n, find_lib_name) { \
983 int invert = 1; \
984 if (find_lib_name[0] == '!') \
985 invert = 0, ++find_lib_name; \
860 if (!strcmp(find_lib_name, needed)) \ 986 if (!strcmp(find_lib_name, needed) == invert) \
861 ++matched; \ 987 ++matched; \
988 } \
862 \ 989 \
863 if (matched == array_cnt(find_lib_arr)) { \ 990 if (matched == array_cnt(find_lib_arr)) { \
864 *found_lib = 1; \ 991 *found_lib = 1; \
865 return (be_wewy_wewy_quiet ? NULL : find_lib); \ 992 return (be_wewy_wewy_quiet ? NULL : find_lib); \
866 } \ 993 } \
892 *found_interp = 1; \ 1019 *found_interp = 1; \
893 return (be_wewy_wewy_quiet ? NULL : elf->data + EGET(strtbl->sh_offset)); \ 1020 return (be_wewy_wewy_quiet ? NULL : elf->data + EGET(strtbl->sh_offset)); \
894 } 1021 }
895 SHOW_INTERP(32) 1022 SHOW_INTERP(32)
896 SHOW_INTERP(64) 1023 SHOW_INTERP(64)
1024 } else {
1025 /* Walk all the program headers to find the PT_INTERP */
1026#define SHOW_PT_INTERP(B) \
1027 if (elf->elf_class == ELFCLASS ## B) { \
1028 unsigned long i; \
1029 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
1030 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \
1031 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
1032 if (EGET(phdr[i].p_type) != PT_INTERP) \
1033 continue; \
1034 *found_interp = 1; \
1035 return (be_wewy_wewy_quiet ? NULL : elf->data + EGET(phdr[i].p_offset)); \
1036 } \
897 } 1037 }
1038 SHOW_PT_INTERP(32)
1039 SHOW_PT_INTERP(64)
1040 }
1041
898 return NULL; 1042 return NULL;
899} 1043}
900static char *scanelf_file_bind(elfobj *elf, char *found_bind) 1044static char *scanelf_file_bind(elfobj *elf, char *found_bind)
901{ 1045{
902 unsigned long i; 1046 unsigned long i;
1001 * defined symbols. If it's a minus ("-"), only match undefined symbols. 1145 * defined symbols. If it's a minus ("-"), only match undefined symbols.
1002 * Putting modifiers in between the percent signs allows for more in depth 1146 * 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 1147 * 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 1148 * of a group, then all types in that group are matched. The current
1005 * groups and their types are: 1149 * groups and their types are:
1006 * STT group: STT_NOTYPE:n STT_OBJECT:o STT_FUNC:f SST_FILE:F 1150 * 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 1151 * STB group: STB_LOCAL:l STB_GLOBAL:g STB_WEAK:w
1008 * SHN group: SHN_UNDEF:u SHN_ABS:a SHN_COMMON:c {defined}:d 1152 * 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. 1153 * 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 (","). 1154 * You can search for multiple symbols at once by seperating with a comma (",").
1011 * 1155 *
1023 */ 1167 */
1024static void 1168static void
1025scanelf_match_symname(elfobj *elf, char *found_sym, char **ret, size_t *ret_len, const char *symname, 1169scanelf_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) 1170 unsigned int stt, unsigned int stb, unsigned int shn, unsigned long size)
1027{ 1171{
1028 char *this_sym, *next_sym, saved = saved; 1172 const char *this_sym;
1173 size_t n;
1029 1174
1030 /* allow the user to specify a comma delimited list of symbols to search for */ 1175 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, 1176 bool inc_notype, inc_object, inc_func, inc_file,
1034 inc_local, inc_global, inc_weak, 1177 inc_local, inc_global, inc_weak,
1035 inc_def, inc_undef, inc_abs, inc_common; 1178 inc_def, inc_undef, inc_abs, inc_common;
1036
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 1179
1049 /* symbol selection! */ 1180 /* symbol selection! */
1050 inc_notype = inc_object = inc_func = inc_file = \ 1181 inc_notype = inc_object = inc_func = inc_file = \
1051 inc_local = inc_global = inc_weak = \ 1182 inc_local = inc_global = inc_weak = \
1052 inc_def = inc_undef = inc_abs = inc_common = \ 1183 inc_def = inc_undef = inc_abs = inc_common = \
1119 goto matched; 1250 goto matched;
1120 1251
1121 } else { 1252 } else {
1122 if (g_match) { 1253 if (g_match) {
1123 /* regex match the symbol */ 1254 /* regex match the symbol */
1124 if (rematch(this_sym, symname, REG_EXTENDED) != 0) 1255 if (regexec(find_sym_regex_arr->eles[n], symname, 0, NULL, 0) == REG_NOMATCH)
1125 continue; 1256 continue;
1126 1257
1127 } else if (*this_sym) { 1258 } else if (*this_sym) {
1128 /* give empty symbols a "pass", else do a normal compare */ 1259 /* give empty symbols a "pass", else do a normal compare */
1129 const size_t len = strlen(this_sym); 1260 const size_t len = strlen(this_sym);
1145 xstrcat(ret, symname, ret_len); 1276 xstrcat(ret, symname, ret_len);
1146 } 1277 }
1147 1278
1148 goto matched; 1279 goto matched;
1149 } 1280 }
1150 } while (next_sym); 1281 }
1151 1282
1152 return; 1283 return;
1153 1284
1154 matched: 1285 matched:
1155 *found_sym = 1; 1286 *found_sym = 1;
1156 if (next_sym)
1157 next_sym[-1] = saved;
1158} 1287}
1159 1288
1160static const char *scanelf_file_sym(elfobj *elf, char *found_sym) 1289static const char *scanelf_file_sym(elfobj *elf, char *found_sym)
1161{ 1290{
1162 unsigned long i;
1163 char *ret; 1291 char *ret;
1164 void *symtab_void, *strtab_void; 1292 void *symtab_void, *strtab_void;
1165 1293
1166 if (!find_sym) return NULL; 1294 if (!find_sym) return NULL;
1167 ret = NULL; 1295 ret = NULL;
1172#define FIND_SYM(B) \ 1300#define FIND_SYM(B) \
1173 if (elf->elf_class == ELFCLASS ## B) { \ 1301 if (elf->elf_class == ELFCLASS ## B) { \
1174 Elf ## B ## _Shdr *symtab = SHDR ## B (symtab_void); \ 1302 Elf ## B ## _Shdr *symtab = SHDR ## B (symtab_void); \
1175 Elf ## B ## _Shdr *strtab = SHDR ## B (strtab_void); \ 1303 Elf ## B ## _Shdr *strtab = SHDR ## B (strtab_void); \
1176 Elf ## B ## _Sym *sym = SYM ## B (elf->vdata + EGET(symtab->sh_offset)); \ 1304 Elf ## B ## _Sym *sym = SYM ## B (elf->vdata + EGET(symtab->sh_offset)); \
1177 unsigned long cnt = EGET(symtab->sh_entsize); \ 1305 Elf ## B ## _Word i, cnt = EGET(symtab->sh_entsize); \
1178 char *symname; \ 1306 char *symname; \
1179 size_t ret_len = 0; \ 1307 size_t ret_len = 0; \
1180 if (cnt) \ 1308 if (cnt) \
1181 cnt = EGET(symtab->sh_size) / cnt; \ 1309 cnt = EGET(symtab->sh_size) / cnt; \
1182 for (i = 0; i < cnt; ++i) { \ 1310 for (i = 0; i < cnt; ++i) { \
1199 EGET(sym->st_shndx), \ 1327 EGET(sym->st_shndx), \
1200 /* st_size can be 64bit, but no one is really that big, so screw em */ \ 1328 /* st_size can be 64bit, but no one is really that big, so screw em */ \
1201 EGET(sym->st_size)); \ 1329 EGET(sym->st_size)); \
1202 } \ 1330 } \
1203 ++sym; \ 1331 ++sym; \
1204 } } 1332 } \
1333 }
1205 FIND_SYM(32) 1334 FIND_SYM(32)
1206 FIND_SYM(64) 1335 FIND_SYM(64)
1207 } 1336 }
1208 1337
1209break_out: 1338break_out:
1300 case 'x': prints(" PAX "); break; 1429 case 'x': prints(" PAX "); break;
1301 case 'e': prints("STK/REL/PTL "); break; 1430 case 'e': prints("STK/REL/PTL "); break;
1302 case 't': prints("TEXTREL "); break; 1431 case 't': prints("TEXTREL "); break;
1303 case 'r': prints("RPATH "); break; 1432 case 'r': prints("RPATH "); break;
1304 case 'M': prints("CLASS "); break; 1433 case 'M': prints("CLASS "); break;
1434 case 'l':
1305 case 'n': prints("NEEDED "); break; 1435 case 'n': prints("NEEDED "); break;
1306 case 'i': prints("INTERP "); break; 1436 case 'i': prints("INTERP "); break;
1307 case 'b': prints("BIND "); break; 1437 case 'b': prints("BIND "); break;
1308 case 'Z': prints("SIZE "); break; 1438 case 'Z': prints("SIZE "); break;
1309 case 'S': prints("SONAME "); break; 1439 case 'S': prints("SONAME "); break;
1419 elfobj *elf; 1549 elfobj *elf;
1420 1550
1421 /* verify this is real ELF */ 1551 /* verify this is real ELF */
1422 if ((elf = _readelf_fd(filename, fd, len, !fix_elf)) == NULL) { 1552 if ((elf = _readelf_fd(filename, fd, len, !fix_elf)) == NULL) {
1423 if (be_verbose > 2) printf("%s: not an ELF\n", filename); 1553 if (be_verbose > 2) printf("%s: not an ELF\n", filename);
1424 return ret; 1554 return 2;
1425 } 1555 }
1426 switch (match_bits) { 1556 switch (match_bits) {
1427 case 32: 1557 case 32:
1428 if (elf->elf_class != ELFCLASS32) 1558 if (elf->elf_class != ELFCLASS32)
1429 goto label_done; 1559 goto label_done;
1483 munmap(ar_buffer, len); 1613 munmap(ar_buffer, len);
1484 1614
1485 return 0; 1615 return 0;
1486} 1616}
1487/* scan a file which may be an elf or an archive or some other magical beast */ 1617/* 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) 1618static int scanelf_fileat(int dir_fd, const char *filename, const struct stat *st_cache)
1489{ 1619{
1490 const struct stat *st = st_cache; 1620 const struct stat *st = st_cache;
1491 struct stat symlink_st; 1621 struct stat symlink_st;
1492 int fd; 1622 int fd;
1493 1623
1494 /* always handle regular files and handle symlinked files if no -y */ 1624 /* always handle regular files and handle symlinked files if no -y */
1495 if (S_ISLNK(st->st_mode)) { 1625 if (S_ISLNK(st->st_mode)) {
1496 if (!scan_symlink) return 1; 1626 if (!scan_symlink)
1627 return 1;
1497 stat(filename, &symlink_st); 1628 fstatat(dir_fd, filename, &symlink_st, 0);
1498 st = &symlink_st; 1629 st = &symlink_st;
1499 } 1630 }
1500 1631
1501 if (!S_ISREG(st->st_mode)) { 1632 if (!S_ISREG(st->st_mode)) {
1502 if (be_verbose > 2) printf("%s: skipping non-file\n", filename); 1633 if (be_verbose > 2) printf("%s: skipping non-file\n", filename);
1505 1636
1506 if (match_perms) { 1637 if (match_perms) {
1507 if ((st->st_mode | match_perms) != st->st_mode) 1638 if ((st->st_mode | match_perms) != st->st_mode)
1508 return 1; 1639 return 1;
1509 } 1640 }
1510 if ((fd=open(filename, (fix_elf ? O_RDWR : O_RDONLY))) == -1) 1641 fd = openat(dir_fd, filename, (fix_elf ? O_RDWR : O_RDONLY) | O_CLOEXEC);
1642 if (fd == -1) {
1643 if (fix_elf && errno == ETXTBSY)
1644 warnp("%s: could not fix", filename);
1645 else if (be_verbose > 2)
1646 printf("%s: skipping file: %s\n", filename, strerror(errno));
1511 return 1; 1647 return 1;
1648 }
1512 1649
1513 if (scanelf_elf(filename, fd, st->st_size) == 1 && scan_archives) 1650 if (scanelf_elf(filename, fd, st->st_size) == 2) {
1514 /* if it isn't an ELF, maybe it's an .a archive */ 1651 /* if it isn't an ELF, maybe it's an .a archive */
1652 if (scan_archives)
1515 scanelf_archive(filename, fd, st->st_size); 1653 scanelf_archive(filename, fd, st->st_size);
1516 1654
1655 /*
1656 * unreadelf() implicitly closes its fd, so only close it
1657 * when we are returning it in the non-ELF case
1658 */
1517 close(fd); 1659 close(fd);
1660 }
1661
1518 return 0; 1662 return 0;
1519} 1663}
1520 1664
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 */ 1665/* scan a directory for ET_EXEC files and print when we find one */
1532static int scanelf_dir(const char *path) 1666static int scanelf_dirat(int dir_fd, const char *path)
1533{ 1667{
1534 register DIR *dir; 1668 register DIR *dir;
1535 register struct dirent *dentry; 1669 register struct dirent *dentry;
1536 struct stat st_top, st; 1670 struct stat st_top, st;
1537 char buf[__PAX_UTILS_PATH_MAX]; 1671 char buf[__PAX_UTILS_PATH_MAX], *subpath;
1538 char _path[__PAX_UTILS_PATH_MAX];
1539 size_t pathlen = 0, len = 0; 1672 size_t pathlen = 0, len = 0;
1540 int ret = 0; 1673 int ret = 0;
1541 1674 int subdir_fd;
1542 path = maybe_add_root(path, _path);
1543 1675
1544 /* make sure path exists */ 1676 /* make sure path exists */
1545 if (lstat(path, &st_top) == -1) { 1677 if (fstatat(dir_fd, path, &st_top, AT_SYMLINK_NOFOLLOW) == -1) {
1546 if (be_verbose > 2) printf("%s: does not exist\n", path); 1678 if (be_verbose > 2) printf("%s: does not exist\n", path);
1547 return 1; 1679 return 1;
1548 } 1680 }
1549 1681
1550 /* ok, if it isn't a directory, assume we can open it */ 1682 /* ok, if it isn't a directory, assume we can open it */
1551 if (!S_ISDIR(st_top.st_mode)) { 1683 if (!S_ISDIR(st_top.st_mode))
1552 return scanelf_file(path, &st_top); 1684 return scanelf_fileat(dir_fd, path, &st_top);
1553 }
1554 1685
1555 /* now scan the dir looking for fun stuff */ 1686 /* now scan the dir looking for fun stuff */
1556 if ((dir = opendir(path)) == NULL) { 1687 subdir_fd = openat(dir_fd, path, O_RDONLY|O_CLOEXEC);
1557 warnf("could not opendir %s: %s", path, strerror(errno)); 1688 if (subdir_fd == -1)
1689 dir = NULL;
1690 else
1691 dir = fdopendir(subdir_fd);
1692 if (dir == NULL) {
1693 if (subdir_fd != -1)
1694 close(subdir_fd);
1695 warnfp("could not opendir(%s)", path);
1558 return 1; 1696 return 1;
1559 } 1697 }
1560 if (be_verbose > 1) printf("%s: scanning dir\n", path); 1698 if (be_verbose > 1) printf("%s: scanning dir\n", path);
1561 1699
1562 pathlen = strlen(path); 1700 subpath = stpcpy(buf, path);
1701 if (subpath[-1] != '/')
1702 *subpath++ = '/';
1703 pathlen = subpath - buf;
1563 while ((dentry = readdir(dir))) { 1704 while ((dentry = readdir(dir))) {
1564 if (!strcmp(dentry->d_name, ".") || !strcmp(dentry->d_name, "..")) 1705 if (!strcmp(dentry->d_name, ".") || !strcmp(dentry->d_name, ".."))
1565 continue; 1706 continue;
1566 len = (pathlen + 1 + strlen(dentry->d_name) + 1); 1707
1567 if (len >= sizeof(buf)) { 1708 if (fstatat(subdir_fd, dentry->d_name, &st, AT_SYMLINK_NOFOLLOW) == -1)
1568 warnf("Skipping '%s': len > sizeof(buf); %lu > %lu\n", path,
1569 (unsigned long)len, (unsigned long)sizeof(buf));
1570 continue; 1709 continue;
1710
1711 len = strlen(dentry->d_name);
1712 if (len + pathlen + 1 >= sizeof(buf)) {
1713 warnf("Skipping '%s%s': len > sizeof(buf); %zu > %zu\n",
1714 path, dentry->d_name, len + pathlen + 1, sizeof(buf));
1715 continue;
1571 } 1716 }
1572 snprintf(buf, sizeof(buf), "%s%s%s", path, (path[pathlen-1] == '/') ? "" : "/", dentry->d_name); 1717 memcpy(subpath, dentry->d_name, len);
1573 if (lstat(buf, &st) != -1) { 1718 subpath[len] = '\0';
1719
1574 if (S_ISREG(st.st_mode)) 1720 if (S_ISREG(st.st_mode))
1575 ret = scanelf_file(buf, &st); 1721 ret = scanelf_fileat(dir_fd, buf, &st);
1576 else if (dir_recurse && S_ISDIR(st.st_mode)) { 1722 else if (dir_recurse && S_ISDIR(st.st_mode)) {
1577 if (dir_crossmount || (st_top.st_dev == st.st_dev)) 1723 if (dir_crossmount || (st_top.st_dev == st.st_dev))
1578 ret = scanelf_dir(buf); 1724 ret = scanelf_dirat(dir_fd, buf);
1579 }
1580 } 1725 }
1581 } 1726 }
1582 closedir(dir); 1727 closedir(dir);
1728
1583 return ret; 1729 return ret;
1584} 1730}
1731static int scanelf_dir(const char *path)
1732{
1733 return scanelf_dirat(root_fd, root_rel_path(path));
1734}
1585 1735
1586static int scanelf_from_file(const char *filename) 1736static int scanelf_from_file(const char *filename)
1587{ 1737{
1588 FILE *fp = NULL; 1738 FILE *fp;
1589 char *p; 1739 char *p, *path;
1590 char path[__PAX_UTILS_PATH_MAX]; 1740 size_t len;
1591 int ret = 0; 1741 int ret;
1592 1742
1593 if (strcmp(filename, "-") == 0) 1743 if (strcmp(filename, "-") == 0)
1594 fp = stdin; 1744 fp = stdin;
1595 else if ((fp = fopen(filename, "r")) == NULL) 1745 else if ((fp = fopen(filename, "r")) == NULL)
1596 return 1; 1746 return 1;
1597 1747
1598 while ((fgets(path, __PAX_UTILS_PATH_MAX, fp)) != NULL) { 1748 path = NULL;
1749 len = 0;
1750 ret = 0;
1751 while (getline(&path, &len, fp) != -1) {
1599 if ((p = strchr(path, '\n')) != NULL) 1752 if ((p = strchr(path, '\n')) != NULL)
1600 *p = 0; 1753 *p = 0;
1601 search_path = path; 1754 search_path = path;
1602 ret = scanelf_dir(path); 1755 ret = scanelf_dir(path);
1603 } 1756 }
1757 free(path);
1758
1604 if (fp != stdin) 1759 if (fp != stdin)
1605 fclose(fp); 1760 fclose(fp);
1761
1606 return ret; 1762 return ret;
1607} 1763}
1608 1764
1609#if defined(__GLIBC__) || defined(__UCLIBC__) || defined(__NetBSD__) 1765#if defined(__GLIBC__) || defined(__UCLIBC__) || defined(__NetBSD__)
1610 1766
1611static int load_ld_cache_config(int i, const char *fname) 1767static int _load_ld_cache_config(const char *fname)
1612{ 1768{
1613 FILE *fp = NULL; 1769 FILE *fp = NULL;
1614 char *p; 1770 char *p, *path;
1615 char path[__PAX_UTILS_PATH_MAX]; 1771 size_t len;
1616 char _fname[__PAX_UTILS_PATH_MAX]; 1772 int curr_fd = -1;
1617 1773
1618 fname = maybe_add_root(fname, _fname); 1774 fp = fopenat_r(root_fd, root_rel_path(fname));
1619 1775 if (fp == NULL)
1620 if ((fp = fopen(fname, "r")) == NULL)
1621 return i; 1776 return -1;
1622 1777
1623 while ((fgets(path, __PAX_UTILS_PATH_MAX, fp)) != NULL) { 1778 path = NULL;
1779 len = 0;
1780 while (getline(&path, &len, fp) != -1) {
1624 if ((p = strrchr(path, '\r')) != NULL) 1781 if ((p = strrchr(path, '\r')) != NULL)
1625 *p = 0; 1782 *p = 0;
1626 if ((p = strchr(path, '\n')) != NULL) 1783 if ((p = strchr(path, '\n')) != NULL)
1627 *p = 0; 1784 *p = 0;
1628 1785
1629 /* recursive includes of the same file will make this segfault. */ 1786 /* recursive includes of the same file will make this segfault. */
1630 if ((memcmp(path, "include", 7) == 0) && isblank(path[7])) { 1787 if ((memcmp(path, "include", 7) == 0) && isblank(path[7])) {
1631 glob_t gl; 1788 glob_t gl;
1632 size_t x; 1789 size_t x;
1633 char gpath[__PAX_UTILS_PATH_MAX]; 1790 const char *gpath;
1634 1791
1635 memset(gpath, 0, sizeof(gpath)); 1792 /* re-use existing path buffer ... need to be creative */
1636 if (root)
1637 strcpy(gpath, root);
1638
1639 if (path[8] != '/') 1793 if (path[8] != '/')
1640 snprintf(gpath+strlen(gpath), sizeof(gpath)-strlen(gpath), "/etc/%s", &path[8]); 1794 gpath = memcpy(path + 3, "/etc/", 5);
1641 else 1795 else
1642 strncpy(gpath+strlen(gpath), &path[8], sizeof(gpath)-strlen(gpath)); 1796 gpath = path + 8;
1797 if (root_fd != AT_FDCWD) {
1798 if (curr_fd == -1) {
1799 curr_fd = open(".", O_RDONLY|O_CLOEXEC);
1800 if (fchdir(root_fd))
1801 errp("unable to change to root dir");
1802 }
1803 gpath = root_rel_path(gpath);
1804 }
1643 1805
1644 if (glob(gpath, 0, NULL, &gl) == 0) { 1806 if (glob(gpath, 0, NULL, &gl) == 0) {
1645 for (x = 0; x < gl.gl_pathc; ++x) { 1807 for (x = 0; x < gl.gl_pathc; ++x) {
1646 /* try to avoid direct loops */ 1808 /* try to avoid direct loops */
1647 if (strcmp(gl.gl_pathv[x], fname) == 0) 1809 if (strcmp(gl.gl_pathv[x], fname) == 0)
1648 continue; 1810 continue;
1649 i = load_ld_cache_config(i, gl.gl_pathv[x]); 1811 _load_ld_cache_config(gl.gl_pathv[x]);
1650 } 1812 }
1651 globfree(&gl); 1813 globfree(&gl);
1652 continue;
1653 } 1814 }
1815
1816 /* failed globs are ignored by glibc */
1817 continue;
1654 } 1818 }
1655 1819
1656 if (*path != '/') 1820 if (*path != '/')
1657 continue; 1821 continue;
1658 1822
1659 xarraypush(ldpaths, path, strlen(path)); 1823 xarraypush_str(ldpaths, path);
1660 } 1824 }
1825 free(path);
1661 1826
1662 fclose(fp); 1827 fclose(fp);
1828
1829 if (curr_fd != -1) {
1830 if (fchdir(curr_fd))
1831 /* don't care */;
1832 close(curr_fd);
1833 }
1834
1663 return i; 1835 return 0;
1664} 1836}
1665 1837
1666#elif defined(__FreeBSD__) || defined(__DragonFly__) 1838#elif defined(__FreeBSD__) || defined(__DragonFly__)
1667 1839
1668static int load_ld_cache_config(int i, const char *fname) 1840static int _load_ld_cache_config(const char *fname)
1669{ 1841{
1670 FILE *fp = NULL; 1842 FILE *fp = NULL;
1671 char *b = NULL, *p; 1843 char *b = NULL, *p;
1672 struct elfhints_hdr hdr; 1844 struct elfhints_hdr hdr;
1673 char _fname[__PAX_UTILS_PATH_MAX];
1674 1845
1675 fname = maybe_add_root(fname, _fname); 1846 fp = fopenat_r(root_fd, root_rel_path(fname));
1676 1847 if (fp == NULL)
1677 if ((fp = fopen(fname, "r")) == NULL)
1678 return i; 1848 return -1;
1679 1849
1680 if (fread(&hdr, 1, sizeof(hdr), fp) != sizeof(hdr) || 1850 if (fread(&hdr, 1, sizeof(hdr), fp) != sizeof(hdr) ||
1681 hdr.magic != ELFHINTS_MAGIC || hdr.version != 1 || 1851 hdr.magic != ELFHINTS_MAGIC || hdr.version != 1 ||
1682 fseek(fp, hdr.strtab + hdr.dirlist, SEEK_SET) == -1) 1852 fseek(fp, hdr.strtab + hdr.dirlist, SEEK_SET) == -1)
1683 { 1853 {
1684 fclose(fp); 1854 fclose(fp);
1685 return i; 1855 return -1;
1686 } 1856 }
1687 1857
1688 b = xmalloc(hdr.dirlistlen + 1); 1858 b = xmalloc(hdr.dirlistlen + 1);
1689 if (fread(b, 1, hdr.dirlistlen+1, fp) != hdr.dirlistlen+1) { 1859 if (fread(b, 1, hdr.dirlistlen+1, fp) != hdr.dirlistlen+1) {
1690 fclose(fp); 1860 fclose(fp);
1691 free(b); 1861 free(b);
1692 return i; 1862 return -1;
1693 } 1863 }
1694 1864
1695 while ((p = strsep(&b, ":"))) { 1865 while ((p = strsep(&b, ":"))) {
1696 if (*p == '\0') 1866 if (*p == '\0')
1697 continue; 1867 continue;
1698 xarraypush(ldpaths, p, strlen(p)); 1868 xarraypush_str(ldpaths, p);
1699 } 1869 }
1700 1870
1701 free(b); 1871 free(b);
1702 fclose(fp); 1872 fclose(fp);
1703 return i; 1873 return 0;
1704} 1874}
1705 1875
1706#else 1876#else
1707#ifdef __ELF__ 1877#ifdef __ELF__
1708#warning Cache config support not implemented for your target 1878#warning Cache config support not implemented for your target
1709#endif 1879#endif
1710static int load_ld_cache_config(int i, const char *fname) 1880static int _load_ld_cache_config(const char *fname)
1711{ 1881{
1712 return 0; 1882 return 0;
1713} 1883}
1714#endif 1884#endif
1885
1886static void load_ld_cache_config(const char *fname)
1887{
1888 bool scan_l, scan_ul, scan_ull;
1889 size_t n;
1890 const char *ldpath;
1891
1892 _load_ld_cache_config(fname);
1893
1894 scan_l = scan_ul = scan_ull = false;
1895 if (array_cnt(ldpaths)) {
1896 array_for_each(ldpaths, n, ldpath) {
1897 if (!scan_l && !strcmp(ldpath, "/lib")) scan_l = true;
1898 if (!scan_ul && !strcmp(ldpath, "/usr/lib")) scan_ul = true;
1899 if (!scan_ull && !strcmp(ldpath, "/usr/local/lib")) scan_ull = true;
1900 }
1901 }
1902
1903 if (!scan_l) xarraypush_str(ldpaths, "/lib");
1904 if (!scan_ul) xarraypush_str(ldpaths, "/usr/lib");
1905 if (!scan_ull) xarraypush_str(ldpaths, "/usr/local/lib");
1906}
1715 1907
1716/* scan /etc/ld.so.conf for paths */ 1908/* scan /etc/ld.so.conf for paths */
1717static void scanelf_ldpath(void) 1909static void scanelf_ldpath(void)
1718{ 1910{
1719 char scan_l, scan_ul, scan_ull;
1720 size_t n; 1911 size_t n;
1721 const char *ldpath; 1912 const char *ldpath;
1722 int i = 0;
1723 1913
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) { 1914 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); 1915 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} 1916}
1741 1917
1742/* scan env PATH for paths */ 1918/* scan env PATH for paths */
1743static void scanelf_envpath(void) 1919static void scanelf_envpath(void)
1744{ 1920{
1761#define PARSE_FLAGS "plRmyAXz:xetrnLibSs:k:gN:TaqvF:f:o:E:M:DIYO:ZCBhV" 1937#define PARSE_FLAGS "plRmyAXz:xetrnLibSs:k:gN:TaqvF:f:o:E:M:DIYO:ZCBhV"
1762#define a_argument required_argument 1938#define a_argument required_argument
1763static struct option const long_opts[] = { 1939static struct option const long_opts[] = {
1764 {"path", no_argument, NULL, 'p'}, 1940 {"path", no_argument, NULL, 'p'},
1765 {"ldpath", no_argument, NULL, 'l'}, 1941 {"ldpath", no_argument, NULL, 'l'},
1942 {"use-ldpath",no_argument, NULL, 129},
1766 {"root", a_argument, NULL, 128}, 1943 {"root", a_argument, NULL, 128},
1767 {"recursive", no_argument, NULL, 'R'}, 1944 {"recursive", no_argument, NULL, 'R'},
1768 {"mount", no_argument, NULL, 'm'}, 1945 {"mount", no_argument, NULL, 'm'},
1769 {"symlink", no_argument, NULL, 'y'}, 1946 {"symlink", no_argument, NULL, 'y'},
1770 {"archives", no_argument, NULL, 'A'}, 1947 {"archives", no_argument, NULL, 'A'},
1805}; 1982};
1806 1983
1807static const char * const opts_help[] = { 1984static const char * const opts_help[] = {
1808 "Scan all directories in PATH environment", 1985 "Scan all directories in PATH environment",
1809 "Scan all directories in /etc/ld.so.conf", 1986 "Scan all directories in /etc/ld.so.conf",
1987 "Use ld.so.conf to show full path (use with -r/-n)",
1810 "Root directory (use with -l or -p)", 1988 "Root directory (use with -l or -p)",
1811 "Scan directories recursively", 1989 "Scan directories recursively",
1812 "Don't recursively cross mount points", 1990 "Don't recursively cross mount points",
1813 "Don't scan symlinks", 1991 "Don't scan symlinks",
1814 "Scan archives (.a files)", 1992 "Scan archives (.a files)",
1815 "Utilize ld.so.cache information (use with -r/-n)", 1993 "Utilize ld.so.cache to show full path (use with -r/-n)",
1816 "Try and 'fix' bad things (use with -r/-e)", 1994 "Try and 'fix' bad things (use with -r/-e)",
1817 "Sets EI_PAX/PT_PAX_FLAGS to <arg> (use with -Xx)\n", 1995 "Sets EI_PAX/PT_PAX_FLAGS to <arg> (use with -Xx)\n",
1818 "Print PaX markings", 1996 "Print PaX markings",
1819 "Print GNU_STACK/PT_LOAD markings", 1997 "Print GNU_STACK/PT_LOAD markings",
1820 "Print TEXTREL information", 1998 "Print TEXTREL information",
1824 "Print BIND information", 2002 "Print BIND information",
1825 "Print SONAME information", 2003 "Print SONAME information",
1826 "Find a specified symbol", 2004 "Find a specified symbol",
1827 "Find a specified section", 2005 "Find a specified section",
1828 "Find a specified library", 2006 "Find a specified library",
1829 "Use regex matching rather than string compare (use with -s)", 2007 "Use regex rather than string compare (with -s); specify twice for case insensitive",
1830 "Locate cause of TEXTREL", 2008 "Locate cause of TEXTREL",
1831 "Print only ELF files matching etype ET_DYN,ET_EXEC ...", 2009 "Print only ELF files matching etype ET_DYN,ET_EXEC ...",
1832 "Print only ELF files matching numeric bits", 2010 "Print only ELF files matching numeric bits",
1833 "Print Endianness", 2011 "Print Endianness",
1834 "Print OSABI", 2012 "Print OSABI",
1853{ 2031{
1854 unsigned long i; 2032 unsigned long i;
1855 printf("* Scan ELF binaries for stuff\n\n" 2033 printf("* Scan ELF binaries for stuff\n\n"
1856 "Usage: %s [options] <dir1/file1> [dir2 dirN file2 fileN ...]\n\n", argv0); 2034 "Usage: %s [options] <dir1/file1> [dir2 dirN file2 fileN ...]\n\n", argv0);
1857 printf("Options: -[%s]\n", PARSE_FLAGS); 2035 printf("Options: -[%s]\n", PARSE_FLAGS);
1858 for (i = 0; long_opts[i].name; ++i) 2036 for (i = 0; long_opts[i].name; ++i) {
2037 /* first output the short flag if it has one */
2038 if (long_opts[i].val > '~')
2039 printf(" ");
2040 else
2041 printf(" -%c, ", long_opts[i].val);
2042
2043 /* then the long flag */
1859 if (long_opts[i].has_arg == no_argument) 2044 if (long_opts[i].has_arg == no_argument)
1860 printf(" -%c, --%-14s* %s\n", long_opts[i].val, 2045 printf("--%-14s", 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 2046 else
1866 printf(" -%c, --%-7s <arg> * %s\n", long_opts[i].val, 2047 printf("--%-7s <arg> ", long_opts[i].name);
1867 long_opts[i].name, opts_help[i]); 2048
2049 /* finally the help text */
2050 printf("* %s\n", opts_help[i]);
2051 }
1868 2052
1869 puts("\nFor more information, see the scanelf(1) manpage"); 2053 puts("\nFor more information, see the scanelf(1) manpage");
1870 exit(status); 2054 exit(status);
1871} 2055}
1872 2056
1882static int parseargs(int argc, char *argv[]) 2066static int parseargs(int argc, char *argv[])
1883{ 2067{
1884 int i; 2068 int i;
1885 const char *from_file = NULL; 2069 const char *from_file = NULL;
1886 int ret = 0; 2070 int ret = 0;
2071 char load_cache_config = 0;
1887 2072
1888 opterr = 0; 2073 opterr = 0;
1889 while ((i=getopt_long(argc, argv, PARSE_FLAGS, long_opts, NULL)) != -1) { 2074 while ((i=getopt_long(argc, argv, PARSE_FLAGS, long_opts, NULL)) != -1) {
1890 switch (i) { 2075 switch (i) {
1891 2076
1916 if (sscanf(optarg, "%o", &match_perms) == -1) 2101 if (sscanf(optarg, "%o", &match_perms) == -1)
1917 match_bits = 0; 2102 match_bits = 0;
1918 break; 2103 break;
1919 case 'o': { 2104 case 'o': {
1920 if (freopen(optarg, "w", stdout) == NULL) 2105 if (freopen(optarg, "w", stdout) == NULL)
1921 err("Could not open output stream '%s': %s", optarg, strerror(errno)); 2106 errp("Could not freopen(%s)", optarg);
1922 break; 2107 break;
1923 } 2108 }
1924 case 'k': 2109 case 'k':
1925 xarraypush(find_section_arr, optarg, strlen(optarg)); 2110 xarraypush_str(find_section_arr, optarg);
1926 break; 2111 break;
1927 case 's': { 2112 case 's': {
1928 if (find_sym) warn("You prob don't want to specify -s twice"); 2113 /* historically, this was comma delimited */
1929 find_sym = optarg; 2114 char *this_sym = strtok(optarg, ",");
2115 if (!this_sym) /* edge case: -s '' */
2116 xarraypush_str(find_sym_arr, "");
2117 while (this_sym) {
2118 xarraypush_str(find_sym_arr, this_sym);
2119 this_sym = strtok(NULL, ",");
2120 }
1930 break; 2121 break;
1931 } 2122 }
1932 case 'N': 2123 case 'N':
1933 xarraypush(find_lib_arr, optarg, strlen(optarg)); 2124 xarraypush_str(find_lib_arr, optarg);
1934 break; 2125 break;
1935 case 'F': { 2126 case 'F': {
1936 if (out_format) warn("You prob don't want to specify -F twice"); 2127 if (out_format) warn("You prob don't want to specify -F twice");
1937 out_format = optarg; 2128 out_format = optarg;
1938 break; 2129 break;
1979 ((flags & PF_RANDMMAP) && (flags & PF_NORANDMMAP)))) 2170 ((flags & PF_RANDMMAP) && (flags & PF_NORANDMMAP))))
1980 setpax = flags; 2171 setpax = flags;
1981 break; 2172 break;
1982 } 2173 }
1983 case 'Z': show_size = 1; break; 2174 case 'Z': show_size = 1; break;
1984 case 'g': g_match = 1; break; 2175 case 'g': ++g_match; break;
1985 case 'L': use_ldcache = 1; break; 2176 case 'L': load_cache_config = use_ldcache = 1; break;
1986 case 'y': scan_symlink = 0; break; 2177 case 'y': scan_symlink = 0; break;
1987 case 'A': scan_archives = 1; break; 2178 case 'A': scan_archives = 1; break;
1988 case 'C': color_init(true); break; 2179 case 'C': color_init(true); break;
1989 case 'B': show_banner = 0; break; 2180 case 'B': show_banner = 0; break;
1990 case 'l': scan_ldpath = 1; break; 2181 case 'l': load_cache_config = scan_ldpath = 1; break;
1991 case 'p': scan_envpath = 1; break; 2182 case 'p': scan_envpath = 1; break;
1992 case 'R': dir_recurse = 1; break; 2183 case 'R': dir_recurse = 1; break;
1993 case 'm': dir_crossmount = 0; break; 2184 case 'm': dir_crossmount = 0; break;
1994 case 'X': ++fix_elf; break; 2185 case 'X': ++fix_elf; break;
1995 case 'x': show_pax = 1; break; 2186 case 'x': show_pax = 1; break;
1999 case 'n': show_needed = 1; break; 2190 case 'n': show_needed = 1; break;
2000 case 'i': show_interp = 1; break; 2191 case 'i': show_interp = 1; break;
2001 case 'b': show_bind = 1; break; 2192 case 'b': show_bind = 1; break;
2002 case 'S': show_soname = 1; break; 2193 case 'S': show_soname = 1; break;
2003 case 'T': show_textrels = 1; break; 2194 case 'T': show_textrels = 1; break;
2004 case 'q': be_quiet = 1; break; 2195 case 'q': be_quiet = min(be_quiet, 20) + 1; break;
2005 case 'v': be_verbose = (be_verbose % 20) + 1; break; 2196 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; 2197 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; 2198 case 'D': show_endian = 1; break;
2008 case 'I': show_osabi = 1; break; 2199 case 'I': show_osabi = 1; break;
2009 case 'Y': show_eabi = 1; break; 2200 case 'Y': show_eabi = 1; break;
2010 case 128: 2201 case 128:
2011 root = optarg; 2202 root_fd = open(optarg, O_RDONLY|O_CLOEXEC);
2203 if (root_fd == -1)
2204 err("Could not open root: %s", optarg);
2012 break; 2205 break;
2206 case 129: load_cache_config = use_ldpath = 1; break;
2013 case ':': 2207 case ':':
2014 err("Option '%c' is missing parameter", optopt); 2208 err("Option '%c' is missing parameter", optopt);
2015 case '?': 2209 case '?':
2016 err("Unknown option '%c' or argument missing", optopt); 2210 err("Unknown option '%c' or argument missing", optopt);
2017 default: 2211 default:
2018 err("Unhandled option '%c'; please report this", i); 2212 err("Unhandled option '%c'; please report this", i);
2019 } 2213 }
2020 } 2214 }
2021 if (show_textrels && be_verbose) { 2215 if (show_textrels && be_verbose)
2022 if (which("objdump") != NULL) 2216 has_objdump = bin_in_path("objdump");
2023 has_objdump = 1; 2217 /* precompile all the regexes */
2218 if (g_match) {
2219 regex_t preg;
2220 const char *this_sym;
2221 size_t n;
2222 int flags = REG_EXTENDED | REG_NOSUB | (g_match > 1 ? REG_ICASE : 0);
2223
2224 array_for_each(find_sym_arr, n, this_sym) {
2225 /* see scanelf_match_symname for logic info */
2226 switch (this_sym[0]) {
2227 case '%':
2228 while (*(this_sym++))
2229 if (*this_sym == '%') {
2230 ++this_sym;
2231 break;
2232 }
2233 break;
2234 case '+':
2235 case '-':
2236 ++this_sym;
2237 break;
2238 }
2239 if (*this_sym == '*')
2240 ++this_sym;
2241
2242 ret = regcomp(&preg, this_sym, flags);
2243 if (ret) {
2244 char err[256];
2245 regerror(ret, &preg, err, sizeof(err));
2246 err("regcomp of %s failed: %s", this_sym, err);
2247 }
2248 xarraypush(find_sym_regex_arr, &preg, sizeof(preg));
2249 }
2024 } 2250 }
2025 /* flatten arrays for display */ 2251 /* flatten arrays for display */
2252 if (array_cnt(find_sym_arr))
2253 find_sym = array_flatten_str(find_sym_arr);
2026 if (array_cnt(find_lib_arr)) 2254 if (array_cnt(find_lib_arr))
2027 find_lib = array_flatten_str(find_lib_arr); 2255 find_lib = array_flatten_str(find_lib_arr);
2028 if (array_cnt(find_section_arr)) 2256 if (array_cnt(find_section_arr))
2029 find_section = array_flatten_str(find_section_arr); 2257 find_section = array_flatten_str(find_section_arr);
2030 /* let the format option override all other options */ 2258 /* let the format option override all other options */
2062 case 'i': show_interp = 1; break; 2290 case 'i': show_interp = 1; break;
2063 case 'b': show_bind = 1; break; 2291 case 'b': show_bind = 1; break;
2064 case 'S': show_soname = 1; break; 2292 case 'S': show_soname = 1; break;
2065 case 'T': show_textrels = 1; break; 2293 case 'T': show_textrels = 1; break;
2066 default: 2294 default:
2067 err("Invalid format specifier '%c' (byte %i)", 2295 err("invalid format specifier '%c' (byte %i)",
2068 out_format[i], i+1); 2296 out_format[i], i+1);
2069 } 2297 }
2070 } 2298 }
2071 2299
2072 /* construct our default format */ 2300 /* construct our default format */
2095 if (!be_quiet) xstrcat(&out_format, "%F ", &fmt_len); 2323 if (!be_quiet) xstrcat(&out_format, "%F ", &fmt_len);
2096 } 2324 }
2097 if (be_verbose > 2) printf("Format: %s\n", out_format); 2325 if (be_verbose > 2) printf("Format: %s\n", out_format);
2098 2326
2099 /* now lets actually do the scanning */ 2327 /* now lets actually do the scanning */
2100 if (scan_ldpath || use_ldcache) 2328 if (load_cache_config)
2101 load_ld_cache_config(0, __PAX_UTILS_DEFAULT_LD_CACHE_CONFIG); 2329 load_ld_cache_config(__PAX_UTILS_DEFAULT_LD_CACHE_CONFIG);
2102 if (scan_ldpath) scanelf_ldpath(); 2330 if (scan_ldpath) scanelf_ldpath();
2103 if (scan_envpath) scanelf_envpath(); 2331 if (scan_envpath) scanelf_envpath();
2104 if (!from_file && optind == argc && ttyname(0) == NULL && !scan_ldpath && !scan_envpath) 2332 if (!from_file && optind == argc && ttyname(0) == NULL && !scan_ldpath && !scan_envpath)
2105 from_file = "-"; 2333 from_file = "-";
2106 if (from_file) { 2334 if (from_file) {
2112 while (optind < argc) { 2340 while (optind < argc) {
2113 search_path = argv[optind++]; 2341 search_path = argv[optind++];
2114 ret = scanelf_dir(search_path); 2342 ret = scanelf_dir(search_path);
2115 } 2343 }
2116 2344
2345#ifdef __PAX_UTILS_CLEANUP
2117 /* clean up */ 2346 /* clean up */
2118 xarrayfree(ldpaths); 2347 xarrayfree(ldpaths);
2348 xarrayfree(find_sym_arr);
2119 xarrayfree(find_lib_arr); 2349 xarrayfree(find_lib_arr);
2120 xarrayfree(find_section_arr); 2350 xarrayfree(find_section_arr);
2351 free(find_sym);
2121 free(find_lib); 2352 free(find_lib);
2122 free(find_section); 2353 free(find_section);
2354 {
2355 size_t n;
2356 regex_t *preg;
2357 array_for_each(find_sym_regex_arr, n, preg)
2358 regfree(preg);
2359 xarrayfree(find_sym_regex_arr);
2360 }
2123 2361
2124 if (ldcache != 0) 2362 if (ldcache != 0)
2125 munmap(ldcache, ldcache_size); 2363 munmap(ldcache, ldcache_size);
2364#endif
2365
2126 return ret; 2366 return ret;
2127} 2367}
2128 2368
2129static char **get_split_env(const char *envvar) 2369static char **get_split_env(const char *envvar)
2130{ 2370{
2187 ret = parseargs(argc, argv); 2427 ret = parseargs(argc, argv);
2188 fclose(stdout); 2428 fclose(stdout);
2189#ifdef __PAX_UTILS_CLEANUP 2429#ifdef __PAX_UTILS_CLEANUP
2190 cleanup(); 2430 cleanup();
2191 warn("The calls to add/delete heap should be off:\n" 2431 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" 2432 "\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"); 2433 "\t- 1 per QA_TEXTRELS/QA_EXECSTACK/QA_WX_LOAD");
2194#endif 2434#endif
2195 return ret; 2435 return ret;
2196} 2436}
2197 2437

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

  ViewVC Help
Powered by ViewVC 1.1.20