/[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.264
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.264 2014/03/21 05:27:21 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.264 2014/03/21 05:27:21 vapier Exp $";
11const char argv0[] = "scanelf"; 11const char argv0[] = "scanelf";
12 12
13#include "paxinc.h" 13#include "paxinc.h"
14 14
15#define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+') 15#define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+')
16 16
17/* prototypes */ 17/* prototypes */
18static int file_matches_list(const char *filename, char **matchlist); 18static int file_matches_list(const char *filename, char **matchlist);
19 19
20/* variables to control behavior */ 20/* variables to control behavior */
21static char *match_etypes = NULL; 21static array_t _match_etypes = array_init_decl, *match_etypes = &_match_etypes;
22static array_t _ldpaths = array_init_decl, *ldpaths = &_ldpaths; 22static array_t _ldpaths = array_init_decl, *ldpaths = &_ldpaths;
23static char scan_ldpath = 0; 23static char scan_ldpath = 0;
24static char scan_envpath = 0; 24static char scan_envpath = 0;
25static char scan_symlink = 1; 25static char scan_symlink = 1;
26static char scan_archives = 0; 26static char scan_archives = 0;
44static char be_quiet = 0; 44static char be_quiet = 0;
45static char be_verbose = 0; 45static char be_verbose = 0;
46static char be_wewy_wewy_quiet = 0; 46static char be_wewy_wewy_quiet = 0;
47static char be_semi_verbose = 0; 47static char be_semi_verbose = 0;
48static char *find_sym = NULL; 48static char *find_sym = NULL;
49static array_t _find_sym_arr = array_init_decl, *find_sym_arr = &_find_sym_arr;
50static array_t _find_sym_regex_arr = array_init_decl, *find_sym_regex_arr = &_find_sym_regex_arr;
49static char *find_lib = NULL; 51static char *find_lib = NULL;
50static array_t _find_lib_arr = array_init_decl, *find_lib_arr = &_find_lib_arr; 52static array_t _find_lib_arr = array_init_decl, *find_lib_arr = &_find_lib_arr;
51static char *find_section = NULL; 53static char *find_section = NULL;
52static array_t _find_section_arr = array_init_decl, *find_section_arr = &_find_section_arr; 54static array_t _find_section_arr = array_init_decl, *find_section_arr = &_find_section_arr;
53static char *out_format = NULL; 55static char *out_format = NULL;
54static char *search_path = NULL; 56static char *search_path = NULL;
55static char fix_elf = 0; 57static char fix_elf = 0;
56static char g_match = 0; 58static char g_match = 0;
57static char use_ldcache = 0; 59static char use_ldcache = 0;
60static char use_ldpath = 0;
58 61
59static char **qa_textrels = NULL; 62static char **qa_textrels = NULL;
60static char **qa_execstack = NULL; 63static char **qa_execstack = NULL;
61static char **qa_wx_load = NULL; 64static char **qa_wx_load = NULL;
62static char *root; 65static int root_fd = AT_FDCWD;
63 66
64static int match_bits = 0; 67static int match_bits = 0;
65static unsigned int match_perms = 0; 68static unsigned int match_perms = 0;
66static void *ldcache = NULL; 69static void *ldcache = NULL;
67static size_t ldcache_size = 0; 70static size_t ldcache_size = 0;
68static unsigned long setpax = 0UL; 71static unsigned long setpax = 0UL;
69 72
70static int has_objdump = 0; 73static const char *objdump;
71 74
72/* find the path to a file by name */ 75/* find the path to a file by name */
73static char *which(const char *fname) 76static const char *which(const char *fname, const char *envvar)
74{ 77{
75 static char fullpath[__PAX_UTILS_PATH_MAX]; 78 size_t path_len, fname_len;
79 const char *env_path;
76 char *path, *p; 80 char *path, *p, *ep;
77 81
82 p = getenv(envvar);
83 if (p)
84 return p;
85
78 path = getenv("PATH"); 86 env_path = getenv("PATH");
79 if (!path) 87 if (!env_path)
80 return NULL; 88 return NULL;
81 89
82 path = xstrdup(path); 90 /* Create a copy of the $PATH that we can safely modify.
83 while ((p = strrchr(path, ':')) != NULL) { 91 * Make it a little bigger so we can append "/fname".
84 snprintf(fullpath, sizeof(fullpath), "%s/%s", p + 1, fname); 92 * We do this twice -- once for a perm copy, and once for
85 *p = 0; 93 * room at the end of the last element. */
94 path_len = strlen(env_path);
95 fname_len = strlen(fname);
96 path = xmalloc(path_len + (fname_len * 2) + 2 + 2);
97 memcpy(path, env_path, path_len + 1);
98
99 p = path + path_len + 1 + fname_len + 1;
100 *p = '/';
101 memcpy(p + 1, fname, fname_len + 1);
102
103 /* Repoint fname to the copy in the env string as it has
104 * the leading slash which we can include in a single memcpy.
105 * Increase the fname len to include the '/' and '\0'. */
106 fname = p;
107 fname_len += 2;
108
109 p = path;
110 while (p) {
111 ep = strchr(p, ':');
112 /* Append the /foo path to the current element. */
113 if (ep)
114 memcpy(ep, fname, fname_len);
115 else
116 memcpy(path + path_len, fname, fname_len);
117
86 if (access(fullpath, R_OK) != -1) { 118 if (access(p, R_OK) != -1)
87 free(path);
88 return fullpath; 119 return p;
120
121 p = ep;
122 if (ep) {
123 /* If not the last element, restore the chunk we clobbered. */
124 size_t offset = ep - path;
125 size_t restore = min(path_len - offset, fname_len);
126 memcpy(ep, env_path + offset, restore);
127 ++p;
89 } 128 }
90 } 129 }
130
91 free(path); 131 free(path);
92 return NULL; 132 return NULL;
93} 133}
94 134
95/* 1 on failure. 0 otherwise */ 135static FILE *fopenat_r(int dir_fd, const char *path)
96static int rematch(const char *regex, const char *match, int cflags)
97{ 136{
98 regex_t preg; 137 int fd = openat(dir_fd, path, O_RDONLY|O_CLOEXEC);
99 int ret; 138 if (fd == -1)
139 return NULL;
140 return fdopen(fd, "re");
141}
100 142
101 if ((match == NULL) || (regex == NULL)) 143static const char *root_rel_path(const char *path)
102 return EXIT_FAILURE; 144{
103 145 /*
104 if ((ret = regcomp(&preg, regex, cflags))) { 146 * openat() will ignore the dirfd if path starts with
105 char err[256]; 147 * a /, so consume all of that noise
106 148 *
107 if (regerror(ret, &preg, err, sizeof(err))) 149 * XXX: we don't handle relative paths like ../ that
108 fprintf(stderr, "regcomp failed: %s", err); 150 * break out of the --root option, but for now, just
109 else 151 * don't do that :P.
110 fprintf(stderr, "regcomp failed"); 152 */
111 153 if (root_fd != AT_FDCWD) {
112 return EXIT_FAILURE; 154 while (*path == '/')
155 ++path;
156 if (*path == '\0')
157 path = ".";
113 } 158 }
114 ret = regexec(&preg, match, 0, NULL, 0);
115 regfree(&preg);
116 159
117 return ret; 160 return path;
118} 161}
119 162
120/* sub-funcs for scanelf_file() */ 163/* sub-funcs for scanelf_fileat() */
121static void scanelf_file_get_symtabs(elfobj *elf, void **sym, void **tab) 164static void scanelf_file_get_symtabs(elfobj *elf, void **sym, void **str)
122{ 165{
123 /* find the best SHT_DYNSYM and SHT_STRTAB sections */ 166 /* find the best SHT_DYNSYM and SHT_STRTAB sections */
124 167
125 /* debug sections */ 168 /* debug sections */
126 void *symtab = elf_findsecbyname(elf, ".symtab"); 169 void *symtab = elf_findsecbyname(elf, ".symtab");
127 void *strtab = elf_findsecbyname(elf, ".strtab"); 170 void *strtab = elf_findsecbyname(elf, ".strtab");
128 /* runtime sections */ 171 /* runtime sections */
129 void *dynsym = elf_findsecbyname(elf, ".dynsym"); 172 void *dynsym = elf_findsecbyname(elf, ".dynsym");
130 void *dynstr = elf_findsecbyname(elf, ".dynstr"); 173 void *dynstr = elf_findsecbyname(elf, ".dynstr");
131 174
175 /*
176 * If the sections are marked NOBITS, then they don't exist, so we just
177 * skip them. This let's us work sanely with splitdebug ELFs (rather
178 * than spewing a lot of "corrupt ELF" messages later on). In malformed
179 * ELFs, the section might be wrongly set to NOBITS, but screw em.
180 */
132#define GET_SYMTABS(B) \ 181#define GET_SYMTABS(B) \
133 if (elf->elf_class == ELFCLASS ## B) { \ 182 if (elf->elf_class == ELFCLASS ## B) { \
134 if (symtab && dynsym) { \
135 Elf ## B ## _Shdr *esymtab = symtab; \ 183 Elf ## B ## _Shdr *esymtab = symtab; \
184 Elf ## B ## _Shdr *estrtab = strtab; \
136 Elf ## B ## _Shdr *edynsym = dynsym; \ 185 Elf ## B ## _Shdr *edynsym = dynsym; \
186 Elf ## B ## _Shdr *edynstr = dynstr; \
187 \
188 if (symtab && EGET(esymtab->sh_type) == SHT_NOBITS) \
189 symtab = NULL; \
190 if (dynsym && EGET(edynsym->sh_type) == SHT_NOBITS) \
191 dynsym = NULL; \
192 if (symtab && dynsym) \
137 *sym = (EGET(esymtab->sh_size) > EGET(edynsym->sh_size)) ? symtab : dynsym; \ 193 *sym = (EGET(esymtab->sh_size) > EGET(edynsym->sh_size)) ? symtab : dynsym; \
138 } else \ 194 else \
139 *sym = symtab ? symtab : dynsym; \ 195 *sym = symtab ? symtab : dynsym; \
196 \
197 if (strtab && EGET(estrtab->sh_type) == SHT_NOBITS) \
198 strtab = NULL; \
199 if (dynstr && EGET(edynstr->sh_type) == SHT_NOBITS) \
200 dynstr = NULL; \
140 if (strtab && dynstr) { \ 201 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; \ 202 *str = (EGET(estrtab->sh_size) > EGET(edynstr->sh_size)) ? strtab : dynstr; \
144 } else \ 203 else \
145 *tab = strtab ? strtab : dynstr; \ 204 *str = strtab ? strtab : dynstr; \
146 } 205 }
147 GET_SYMTABS(32) 206 GET_SYMTABS(32)
148 GET_SYMTABS(64) 207 GET_SYMTABS(64)
208
209 if (*sym && *str)
210 return;
211
212 /*
213 * damn, they're really going to make us work for it huh?
214 * reconstruct the section header info out of the dynamic
215 * tags so we can see what symbols this guy uses at runtime.
216 */
217#define GET_SYMTABS_DT(B) \
218 if (elf->elf_class == ELFCLASS ## B) { \
219 size_t i; \
220 static Elf ## B ## _Shdr sym_shdr, str_shdr; \
221 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
222 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \
223 Elf ## B ## _Addr vsym, vstr, vhash, vgnu_hash; \
224 Elf ## B ## _Dyn *dyn; \
225 Elf ## B ## _Off offset; \
226 \
227 /* lookup symbols used at runtime with DT_SYMTAB / DT_STRTAB */ \
228 vsym = vstr = vhash = vgnu_hash = 0; \
229 memset(&sym_shdr, 0, sizeof(sym_shdr)); \
230 memset(&str_shdr, 0, sizeof(str_shdr)); \
231 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
232 if (EGET(phdr[i].p_type) != PT_DYNAMIC) \
233 continue; \
234 \
235 offset = EGET(phdr[i].p_offset); \
236 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) \
237 continue; \
238 \
239 dyn = DYN ## B (elf->vdata + offset); \
240 while (EGET(dyn->d_tag) != DT_NULL) { \
241 switch (EGET(dyn->d_tag)) { \
242 case DT_SYMTAB: vsym = EGET(dyn->d_un.d_val); break; \
243 case DT_SYMENT: sym_shdr.sh_entsize = dyn->d_un.d_val; break; \
244 case DT_STRTAB: vstr = EGET(dyn->d_un.d_val); break; \
245 case DT_STRSZ: str_shdr.sh_size = dyn->d_un.d_val; break; \
246 case DT_HASH: vhash = EGET(dyn->d_un.d_val); break; \
247 /*case DT_GNU_HASH: vgnu_hash = EGET(dyn->d_un.d_val); break;*/ \
248 } \
249 ++dyn; \
250 } \
251 if (vsym && vstr) \
252 break; \
253 } \
254 if (!vsym || !vstr || !(vhash || vgnu_hash)) \
255 return; \
256 \
257 /* calc offset into the ELF by finding the load addr of the syms */ \
258 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
259 Elf ## B ## _Addr vaddr = EGET(phdr[i].p_vaddr); \
260 Elf ## B ## _Addr filesz = EGET(phdr[i].p_filesz); \
261 offset = EGET(phdr[i].p_offset); \
262 \
263 if (EGET(phdr[i].p_type) != PT_LOAD) \
264 continue; \
265 \
266 if (vhash >= vaddr && vhash < vaddr + filesz) { \
267 /* Scan the hash table to see how many entries we have */ \
268 Elf32_Word max_sym_idx = 0; \
269 Elf32_Word *hashtbl = elf->vdata + offset + (vhash - vaddr); \
270 Elf32_Word b, nbuckets = EGET(hashtbl[0]); \
271 Elf32_Word nchains = EGET(hashtbl[1]); \
272 Elf32_Word *buckets = &hashtbl[2]; \
273 Elf32_Word *chains = &buckets[nbuckets]; \
274 Elf32_Word sym_idx; \
275 \
276 for (b = 0; b < nbuckets; ++b) { \
277 if (!buckets[b]) \
278 continue; \
279 for (sym_idx = buckets[b]; sym_idx < nchains && sym_idx; sym_idx = chains[sym_idx]) \
280 if (max_sym_idx < sym_idx) \
281 max_sym_idx = sym_idx; \
282 } \
283 ESET(sym_shdr.sh_size, sym_shdr.sh_entsize * max_sym_idx); \
284 } \
285 \
286 if (vsym >= vaddr && vsym < vaddr + filesz) { \
287 ESET(sym_shdr.sh_offset, offset + (vsym - vaddr)); \
288 *sym = &sym_shdr; \
289 } \
290 \
291 if (vstr >= vaddr && vstr < vaddr + filesz) { \
292 ESET(str_shdr.sh_offset, offset + (vstr - vaddr)); \
293 *str = &str_shdr; \
294 } \
295 } \
296 }
297 GET_SYMTABS_DT(32)
298 GET_SYMTABS_DT(64)
149} 299}
150 300
151static char *scanelf_file_pax(elfobj *elf, char *found_pax) 301static char *scanelf_file_pax(elfobj *elf, char *found_pax)
152{ 302{
153 static char ret[7]; 303 static char ret[7];
180 } 330 }
181 SHOW_PAX(32) 331 SHOW_PAX(32)
182 SHOW_PAX(64) 332 SHOW_PAX(64)
183 } 333 }
184 334
185 if (fix_elf && setpax) { 335 /* Note: We do not support setting EI_PAX if not PT_PAX_FLAGS
186 /* set the chpax settings */ 336 * was found. This is known to break ELFs on glibc systems,
187 if (elf->elf_class == ELFCLASS32) { 337 * 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) 338 * We could support changing PT_GNU_STACK, but that doesn't
189 ESET(EHDR32(elf->ehdr)->e_ident[EI_PAX], pax_pf2hf_flags(setpax)); 339 * seem like it's worth the effort. #411919
190 } else { 340 */
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 341
196 /* fall back to EI_PAX if no PT_PAX was found */ 342 /* fall back to EI_PAX if no PT_PAX was found */
197 if (!*ret) { 343 if (!*ret) {
198 static char *paxflags; 344 static char *paxflags;
199 paxflags = pax_short_hf_flags(EI_PAX_FLAGS(elf)); 345 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) 359static char *scanelf_file_phdr(elfobj *elf, char *found_phdr, char *found_relro, char *found_load)
214{ 360{
215 static char ret[12]; 361 static char ret[12];
216 char *found; 362 char *found;
217 unsigned long i, shown, multi_stack, multi_relro, multi_load; 363 unsigned long i, shown, multi_stack, multi_relro, multi_load;
218 int max_pt_load;
219 364
220 if (!show_phdr) return NULL; 365 if (!show_phdr) return NULL;
221 366
222 memcpy(ret, "--- --- ---\0", 12); 367 memcpy(ret, "--- --- ---\0", 12);
223 368
224 shown = 0; 369 shown = 0;
225 multi_stack = multi_relro = multi_load = 0; 370 multi_stack = multi_relro = multi_load = 0;
226 max_pt_load = elf_max_pt_load(elf);
227 371
228#define NOTE_GNU_STACK ".note.GNU-stack" 372#define NOTE_GNU_STACK ".note.GNU-stack"
229#define SHOW_PHDR(B) \ 373#define SHOW_PHDR(B) \
230 if (elf->elf_class == ELFCLASS ## B) { \ 374 if (elf->elf_class == ELFCLASS ## B) { \
231 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \ 375 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
247 warnf("%s: multiple PT_GNU_RELRO's !?", elf->filename); \ 391 warnf("%s: multiple PT_GNU_RELRO's !?", elf->filename); \
248 found = found_relro; \ 392 found = found_relro; \
249 offset = 4; \ 393 offset = 4; \
250 check_flags = PF_X; \ 394 check_flags = PF_X; \
251 } else if (EGET(phdr[i].p_type) == PT_LOAD) { \ 395 } 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)) \ 396 if (file_matches_list(elf->filename, qa_wx_load)) \
256 continue; \ 397 continue; \
257 found = found_load; \ 398 found = found_load; \
258 offset = 8; \ 399 offset = 8; \
259 check_flags = PF_W|PF_X; \ 400 check_flags = PF_W|PF_X; \
276 Elf ## B ## _Shdr *shdr = SHDR ## B (elf->shdr); \ 417 Elf ## B ## _Shdr *shdr = SHDR ## B (elf->shdr); \
277 Elf ## B ## _Shdr *strtbl = shdr + EGET(ehdr->e_shstrndx); \ 418 Elf ## B ## _Shdr *strtbl = shdr + EGET(ehdr->e_shstrndx); \
278 char *str; \ 419 char *str; \
279 if ((void*)strtbl > elf->data_end) \ 420 if ((void*)strtbl > elf->data_end) \
280 goto skip_this_shdr##B; \ 421 goto skip_this_shdr##B; \
422 /* let's flag -w/+x object files since the final ELF will most likely \
423 * need write access to the stack (who doesn't !?). so the combined \
424 * output will bring in +w automatically and that's bad. \
425 */ \
281 check_flags = SHF_WRITE|SHF_EXECINSTR; \ 426 check_flags = /*SHF_WRITE|*/SHF_EXECINSTR; \
282 for (i = 0; i < EGET(ehdr->e_shnum); ++i) { \ 427 for (i = 0; i < EGET(ehdr->e_shnum); ++i) { \
283 if (EGET(shdr[i].sh_type) != SHT_PROGBITS) continue; \ 428 if (EGET(shdr[i].sh_type) != SHT_PROGBITS) continue; \
284 offset = EGET(strtbl->sh_offset) + EGET(shdr[i].sh_name); \ 429 offset = EGET(strtbl->sh_offset) + EGET(shdr[i].sh_name); \
285 str = elf->data + offset; \ 430 str = elf->data + offset; \
286 if (str > elf->data + offset + sizeof(NOTE_GNU_STACK)) continue; \ 431 if (str > elf->data + offset + sizeof(NOTE_GNU_STACK)) continue; \
463 else \ 608 else \
464 printf("%s", func_name); \ 609 printf("%s", func_name); \
465 } else \ 610 } else \
466 printf("(optimized out)"); \ 611 printf("(optimized out)"); \
467 printf(" [0x%lX]\n", (unsigned long)offset_tmp); \ 612 printf(" [0x%lX]\n", (unsigned long)offset_tmp); \
468 if (be_verbose && has_objdump) { \ 613 if (be_verbose && objdump) { \
469 Elf ## B ## _Addr end_addr = offset_tmp + EGET(func->st_size); \ 614 Elf ## B ## _Addr end_addr = offset_tmp + EGET(func->st_size); \
470 char *sysbuf; \ 615 char *sysbuf; \
471 size_t syslen; \ 616 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"; \ 617 const char sysfmt[] = "%s -r -R -d -w -l --start-address=0x%lX --stop-address=0x%lX %s | grep --color -i -C 3 '.*[[:space:]]%lX:[[:space:]]*R_.*'\n"; \
474 syslen = sizeof(sysfmt) + strlen(elf->filename) + 3 * sizeof(unsigned long) + 1; \ 618 syslen = sizeof(sysfmt) + strlen(objdump) + strlen(elf->filename) + 3 * sizeof(unsigned long) + 1; \
475 sysbuf = xmalloc(syslen); \ 619 sysbuf = xmalloc(syslen); \
476 if (end_addr < r_offset) \ 620 if (end_addr < r_offset) \
477 /* not uncommon when things are optimized out */ \ 621 /* not uncommon when things are optimized out */ \
478 end_addr = r_offset + 0x100; \ 622 end_addr = r_offset + 0x100; \
479 snprintf(sysbuf, syslen, sysfmt, \ 623 snprintf(sysbuf, syslen, sysfmt, \
624 objdump, \
480 (unsigned long)offset_tmp, \ 625 (unsigned long)offset_tmp, \
481 (unsigned long)end_addr, \ 626 (unsigned long)end_addr, \
482 elf->filename, \ 627 elf->filename, \
483 (unsigned long)r_offset); \ 628 (unsigned long)r_offset); \
484 fflush(stdout); \ 629 fflush(stdout); \
485 sysret = system(sysbuf); \ 630 if (system(sysbuf)) {/* don't care */} \
486 fflush(stdout); \ 631 fflush(stdout); \
487 free(sysbuf); \ 632 free(sysbuf); \
488 } \ 633 } \
489 } \ 634 } \
490 } } 635 } }
663 xstrcat(ret, (runpath ? runpath : rpath), ret_len); 808 xstrcat(ret, (runpath ? runpath : rpath), ret_len);
664 else if (!be_quiet) 809 else if (!be_quiet)
665 xstrcat(ret, " - ", ret_len); 810 xstrcat(ret, " - ", ret_len);
666} 811}
667 812
813/* Defines can be seen in glibc's sysdeps/generic/ldconfig.h */
668#define LDSO_CACHE_MAGIC "ld.so-" 814#define LDSO_CACHE_MAGIC "ld.so-"
669#define LDSO_CACHE_MAGIC_LEN (sizeof LDSO_CACHE_MAGIC -1) 815#define LDSO_CACHE_MAGIC_LEN (sizeof LDSO_CACHE_MAGIC -1)
670#define LDSO_CACHE_VER "1.7.0" 816#define LDSO_CACHE_VER "1.7.0"
671#define LDSO_CACHE_VER_LEN (sizeof LDSO_CACHE_VER -1) 817#define LDSO_CACHE_VER_LEN (sizeof LDSO_CACHE_VER -1)
672#define FLAG_ANY -1 818#define FLAG_ANY -1
681#define FLAG_X8664_LIB64 0x0300 827#define FLAG_X8664_LIB64 0x0300
682#define FLAG_S390_LIB64 0x0400 828#define FLAG_S390_LIB64 0x0400
683#define FLAG_POWERPC_LIB64 0x0500 829#define FLAG_POWERPC_LIB64 0x0500
684#define FLAG_MIPS64_LIBN32 0x0600 830#define FLAG_MIPS64_LIBN32 0x0600
685#define FLAG_MIPS64_LIBN64 0x0700 831#define FLAG_MIPS64_LIBN64 0x0700
832#define FLAG_X8664_LIBX32 0x0800
833#define FLAG_ARM_LIBHF 0x0900
834#define FLAG_AARCH64_LIB64 0x0a00
686 835
687#if defined(__GLIBC__) || defined(__UCLIBC__) 836#if defined(__GLIBC__) || defined(__UCLIBC__)
688 837
689static char *lookup_cache_lib(elfobj *elf, char *fname) 838static char *lookup_cache_lib(elfobj *elf, const char *fname)
690{ 839{
691 int fd; 840 int fd;
692 char *strs; 841 char *strs;
693 static char buf[__PAX_UTILS_PATH_MAX] = ""; 842 static char buf[__PAX_UTILS_PATH_MAX] = "";
694 const char cachefile[] = "/etc/ld.so.cache"; 843 const char *cachefile = root_rel_path("/etc/ld.so.cache");
695 struct stat st; 844 struct stat st;
696 845
697 typedef struct { 846 typedef struct {
698 char magic[LDSO_CACHE_MAGIC_LEN]; 847 char magic[LDSO_CACHE_MAGIC_LEN];
699 char version[LDSO_CACHE_VER_LEN]; 848 char version[LDSO_CACHE_VER_LEN];
710 859
711 if (fname == NULL) 860 if (fname == NULL)
712 return NULL; 861 return NULL;
713 862
714 if (ldcache == NULL) { 863 if (ldcache == NULL) {
715 if (stat(cachefile, &st)) 864 if (fstatat(root_fd, cachefile, &st, 0))
716 return NULL; 865 return NULL;
717 866
718 fd = open(cachefile, O_RDONLY); 867 fd = openat(root_fd, cachefile, O_RDONLY);
719 if (fd == -1) 868 if (fd == -1)
720 return NULL; 869 return NULL;
721 870
722 /* cache these values so we only map/unmap the cache file once */ 871 /* cache these values so we only map/unmap the cache file once */
723 ldcache_size = st.st_size; 872 ldcache_size = st.st_size;
762 911
763 return buf; 912 return buf;
764} 913}
765 914
766#elif defined(__NetBSD__) 915#elif defined(__NetBSD__)
767static char *lookup_cache_lib(elfobj *elf, char *fname) 916static char *lookup_cache_lib(elfobj *elf, const char *fname)
768{ 917{
769 static char buf[__PAX_UTILS_PATH_MAX] = ""; 918 static char buf[__PAX_UTILS_PATH_MAX] = "";
770 static struct stat st; 919 static struct stat st;
771 size_t n; 920 size_t n;
772 char *ldpath; 921 char *ldpath;
791} 940}
792#else 941#else
793#ifdef __ELF__ 942#ifdef __ELF__
794#warning Cache support not implemented for your target 943#warning Cache support not implemented for your target
795#endif 944#endif
796static char *lookup_cache_lib(elfobj *elf, char *fname) 945static char *lookup_cache_lib(elfobj *elf, const char *fname)
797{ 946{
798 return NULL; 947 return NULL;
799} 948}
800#endif 949#endif
950
951static char *lookup_config_lib(const char *fname)
952{
953 static char buf[__PAX_UTILS_PATH_MAX] = "";
954 const char *ldpath;
955 size_t n;
956
957 array_for_each(ldpaths, n, ldpath) {
958 snprintf(buf, sizeof(buf), "%s/%s", root_rel_path(ldpath), fname);
959 if (faccessat(root_fd, buf, F_OK, AT_SYMLINK_NOFOLLOW) == 0)
960 return buf;
961 }
962
963 return NULL;
964}
801 965
802static const char *scanelf_file_needed_lib(elfobj *elf, char *found_needed, char *found_lib, int op, char **ret, size_t *ret_len) 966static const char *scanelf_file_needed_lib(elfobj *elf, char *found_needed, char *found_lib, int op, char **ret, size_t *ret_len)
803{ 967{
804 unsigned long i; 968 unsigned long i;
805 char *needed; 969 char *needed;
843 needed = elf->data + offset; \ 1007 needed = elf->data + offset; \
844 if (op == 0) { \ 1008 if (op == 0) { \
845 /* -n -> print all entries */ \ 1009 /* -n -> print all entries */ \
846 if (!be_wewy_wewy_quiet) { \ 1010 if (!be_wewy_wewy_quiet) { \
847 if (*found_needed) xchrcat(ret, ',', ret_len); \ 1011 if (*found_needed) xchrcat(ret, ',', ret_len); \
848 if (use_ldcache) \ 1012 if (use_ldpath) { \
1013 if ((p = lookup_config_lib(needed)) != NULL) \
1014 needed = p; \
1015 } else if (use_ldcache) { \
849 if ((p = lookup_cache_lib(elf, needed)) != NULL) \ 1016 if ((p = lookup_cache_lib(elf, needed)) != NULL) \
850 needed = p; \ 1017 needed = p; \
1018 } \
851 xstrcat(ret, needed, ret_len); \ 1019 xstrcat(ret, needed, ret_len); \
852 } \ 1020 } \
853 *found_needed = 1; \ 1021 *found_needed = 1; \
854 } else { \ 1022 } else { \
855 /* -N -> print matching entries */ \ 1023 /* -N -> print matching entries */ \
856 size_t n; \ 1024 size_t n; \
857 const char *find_lib_name; \ 1025 const char *find_lib_name; \
858 \ 1026 \
859 array_for_each(find_lib_arr, n, find_lib_name) \ 1027 array_for_each(find_lib_arr, n, find_lib_name) { \
1028 int invert = 1; \
1029 if (find_lib_name[0] == '!') \
1030 invert = 0, ++find_lib_name; \
860 if (!strcmp(find_lib_name, needed)) \ 1031 if (!strcmp(find_lib_name, needed) == invert) \
861 ++matched; \ 1032 ++matched; \
1033 } \
862 \ 1034 \
863 if (matched == array_cnt(find_lib_arr)) { \ 1035 if (matched == array_cnt(find_lib_arr)) { \
864 *found_lib = 1; \ 1036 *found_lib = 1; \
865 return (be_wewy_wewy_quiet ? NULL : find_lib); \ 1037 return (be_wewy_wewy_quiet ? NULL : find_lib); \
866 } \ 1038 } \
892 *found_interp = 1; \ 1064 *found_interp = 1; \
893 return (be_wewy_wewy_quiet ? NULL : elf->data + EGET(strtbl->sh_offset)); \ 1065 return (be_wewy_wewy_quiet ? NULL : elf->data + EGET(strtbl->sh_offset)); \
894 } 1066 }
895 SHOW_INTERP(32) 1067 SHOW_INTERP(32)
896 SHOW_INTERP(64) 1068 SHOW_INTERP(64)
1069 } else {
1070 /* Walk all the program headers to find the PT_INTERP */
1071#define SHOW_PT_INTERP(B) \
1072 if (elf->elf_class == ELFCLASS ## B) { \
1073 unsigned long i; \
1074 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
1075 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \
1076 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
1077 if (EGET(phdr[i].p_type) != PT_INTERP) \
1078 continue; \
1079 *found_interp = 1; \
1080 return (be_wewy_wewy_quiet ? NULL : elf->data + EGET(phdr[i].p_offset)); \
1081 } \
897 } 1082 }
1083 SHOW_PT_INTERP(32)
1084 SHOW_PT_INTERP(64)
1085 }
1086
898 return NULL; 1087 return NULL;
899} 1088}
900static char *scanelf_file_bind(elfobj *elf, char *found_bind) 1089static const char *scanelf_file_bind(elfobj *elf, char *found_bind)
901{ 1090{
902 unsigned long i; 1091 unsigned long i;
903 struct stat s; 1092 struct stat s;
904 char dynamic = 0; 1093 bool dynamic = false;
905 1094
906 if (!show_bind) return NULL; 1095 if (!show_bind) return NULL;
907 if (!elf->phdr) return NULL; 1096 if (!elf->phdr) return NULL;
908 1097
909#define SHOW_BIND(B) \ 1098#define SHOW_BIND(B) \
912 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \ 1101 Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
913 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \ 1102 Elf ## B ## _Phdr *phdr = PHDR ## B (elf->phdr); \
914 Elf ## B ## _Off offset; \ 1103 Elf ## B ## _Off offset; \
915 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \ 1104 for (i = 0; i < EGET(ehdr->e_phnum); i++) { \
916 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \ 1105 if (EGET(phdr[i].p_type) != PT_DYNAMIC || EGET(phdr[i].p_filesz) == 0) continue; \
917 dynamic = 1; \ 1106 dynamic = true; \
918 offset = EGET(phdr[i].p_offset); \ 1107 offset = EGET(phdr[i].p_offset); \
919 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \ 1108 if (offset >= elf->len - sizeof(Elf ## B ## _Dyn)) continue; \
920 dyn = DYN ## B (elf->vdata + offset); \ 1109 dyn = DYN ## B (elf->vdata + offset); \
921 while (EGET(dyn->d_tag) != DT_NULL) { \ 1110 while (EGET(dyn->d_tag) != DT_NULL) { \
922 if (EGET(dyn->d_tag) == DT_BIND_NOW || \ 1111 if (EGET(dyn->d_tag) == DT_BIND_NOW || \
938 /* don't output anything if quiet mode and the ELF is static or not setuid */ 1127 /* don't output anything if quiet mode and the ELF is static or not setuid */
939 if (be_quiet && (!dynamic || (!fstat(elf->fd, &s) && !(s.st_mode & (S_ISUID|S_ISGID))))) { 1128 if (be_quiet && (!dynamic || (!fstat(elf->fd, &s) && !(s.st_mode & (S_ISUID|S_ISGID))))) {
940 return NULL; 1129 return NULL;
941 } else { 1130 } else {
942 *found_bind = 1; 1131 *found_bind = 1;
943 return (char *)(dynamic ? "LAZY" : "STATIC"); 1132 return dynamic ? "LAZY" : "STATIC";
944 } 1133 }
945} 1134}
946static char *scanelf_file_soname(elfobj *elf, char *found_soname) 1135static char *scanelf_file_soname(elfobj *elf, char *found_soname)
947{ 1136{
948 unsigned long i; 1137 unsigned long i;
1001 * defined symbols. If it's a minus ("-"), only match undefined symbols. 1190 * defined symbols. If it's a minus ("-"), only match undefined symbols.
1002 * Putting modifiers in between the percent signs allows for more in depth 1191 * 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 1192 * 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 1193 * of a group, then all types in that group are matched. The current
1005 * groups and their types are: 1194 * groups and their types are:
1006 * STT group: STT_NOTYPE:n STT_OBJECT:o STT_FUNC:f SST_FILE:F 1195 * 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 1196 * 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 1197 * 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. 1198 * 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 (","). 1199 * You can search for multiple symbols at once by seperating with a comma (",").
1011 * 1200 *
1023 */ 1212 */
1024static void 1213static void
1025scanelf_match_symname(elfobj *elf, char *found_sym, char **ret, size_t *ret_len, const char *symname, 1214scanelf_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) 1215 unsigned int stt, unsigned int stb, unsigned int shn, unsigned long size)
1027{ 1216{
1028 char *this_sym, *next_sym, saved = saved; 1217 const char *this_sym;
1218 size_t n;
1029 1219
1030 /* allow the user to specify a comma delimited list of symbols to search for */ 1220 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, 1221 bool inc_notype, inc_object, inc_func, inc_file,
1034 inc_local, inc_global, inc_weak, 1222 inc_local, inc_global, inc_weak,
1035 inc_def, inc_undef, inc_abs, inc_common; 1223 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 1224
1049 /* symbol selection! */ 1225 /* symbol selection! */
1050 inc_notype = inc_object = inc_func = inc_file = \ 1226 inc_notype = inc_object = inc_func = inc_file = \
1051 inc_local = inc_global = inc_weak = \ 1227 inc_local = inc_global = inc_weak = \
1052 inc_def = inc_undef = inc_abs = inc_common = \ 1228 inc_def = inc_undef = inc_abs = inc_common = \
1119 goto matched; 1295 goto matched;
1120 1296
1121 } else { 1297 } else {
1122 if (g_match) { 1298 if (g_match) {
1123 /* regex match the symbol */ 1299 /* regex match the symbol */
1124 if (rematch(this_sym, symname, REG_EXTENDED) != 0) 1300 if (regexec(find_sym_regex_arr->eles[n], symname, 0, NULL, 0) == REG_NOMATCH)
1125 continue; 1301 continue;
1126 1302
1127 } else if (*this_sym) { 1303 } else if (*this_sym) {
1128 /* give empty symbols a "pass", else do a normal compare */ 1304 /* give empty symbols a "pass", else do a normal compare */
1129 const size_t len = strlen(this_sym); 1305 const size_t len = strlen(this_sym);
1145 xstrcat(ret, symname, ret_len); 1321 xstrcat(ret, symname, ret_len);
1146 } 1322 }
1147 1323
1148 goto matched; 1324 goto matched;
1149 } 1325 }
1150 } while (next_sym); 1326 }
1151 1327
1152 return; 1328 return;
1153 1329
1154 matched: 1330 matched:
1155 *found_sym = 1; 1331 *found_sym = 1;
1156 if (next_sym)
1157 next_sym[-1] = saved;
1158} 1332}
1159 1333
1160static const char *scanelf_file_sym(elfobj *elf, char *found_sym) 1334static const char *scanelf_file_sym(elfobj *elf, char *found_sym)
1161{ 1335{
1162 unsigned long i;
1163 char *ret; 1336 char *ret;
1164 void *symtab_void, *strtab_void; 1337 void *symtab_void, *strtab_void;
1165 1338
1166 if (!find_sym) return NULL; 1339 if (!find_sym) return NULL;
1167 ret = NULL; 1340 ret = NULL;
1172#define FIND_SYM(B) \ 1345#define FIND_SYM(B) \
1173 if (elf->elf_class == ELFCLASS ## B) { \ 1346 if (elf->elf_class == ELFCLASS ## B) { \
1174 Elf ## B ## _Shdr *symtab = SHDR ## B (symtab_void); \ 1347 Elf ## B ## _Shdr *symtab = SHDR ## B (symtab_void); \
1175 Elf ## B ## _Shdr *strtab = SHDR ## B (strtab_void); \ 1348 Elf ## B ## _Shdr *strtab = SHDR ## B (strtab_void); \
1176 Elf ## B ## _Sym *sym = SYM ## B (elf->vdata + EGET(symtab->sh_offset)); \ 1349 Elf ## B ## _Sym *sym = SYM ## B (elf->vdata + EGET(symtab->sh_offset)); \
1177 unsigned long cnt = EGET(symtab->sh_entsize); \ 1350 Elf ## B ## _Word i, cnt = EGET(symtab->sh_entsize); \
1178 char *symname; \ 1351 char *symname; \
1179 size_t ret_len = 0; \ 1352 size_t ret_len = 0; \
1180 if (cnt) \ 1353 if (cnt) \
1181 cnt = EGET(symtab->sh_size) / cnt; \ 1354 cnt = EGET(symtab->sh_size) / cnt; \
1182 for (i = 0; i < cnt; ++i) { \ 1355 for (i = 0; i < cnt; ++i) { \
1199 EGET(sym->st_shndx), \ 1372 EGET(sym->st_shndx), \
1200 /* st_size can be 64bit, but no one is really that big, so screw em */ \ 1373 /* st_size can be 64bit, but no one is really that big, so screw em */ \
1201 EGET(sym->st_size)); \ 1374 EGET(sym->st_size)); \
1202 } \ 1375 } \
1203 ++sym; \ 1376 ++sym; \
1204 } } 1377 } \
1378 }
1205 FIND_SYM(32) 1379 FIND_SYM(32)
1206 FIND_SYM(64) 1380 FIND_SYM(64)
1207 } 1381 }
1208 1382
1209break_out: 1383break_out:
1300 case 'x': prints(" PAX "); break; 1474 case 'x': prints(" PAX "); break;
1301 case 'e': prints("STK/REL/PTL "); break; 1475 case 'e': prints("STK/REL/PTL "); break;
1302 case 't': prints("TEXTREL "); break; 1476 case 't': prints("TEXTREL "); break;
1303 case 'r': prints("RPATH "); break; 1477 case 'r': prints("RPATH "); break;
1304 case 'M': prints("CLASS "); break; 1478 case 'M': prints("CLASS "); break;
1479 case 'l':
1305 case 'n': prints("NEEDED "); break; 1480 case 'n': prints("NEEDED "); break;
1306 case 'i': prints("INTERP "); break; 1481 case 'i': prints("INTERP "); break;
1307 case 'b': prints("BIND "); break; 1482 case 'b': prints("BIND "); break;
1308 case 'Z': prints("SIZE "); break; 1483 case 'Z': prints("SIZE "); break;
1309 case 'S': prints("SONAME "); break; 1484 case 'S': prints("SONAME "); break;
1414 1589
1415/* scan a single elf */ 1590/* scan a single elf */
1416static int scanelf_elf(const char *filename, int fd, size_t len) 1591static int scanelf_elf(const char *filename, int fd, size_t len)
1417{ 1592{
1418 int ret = 1; 1593 int ret = 1;
1594 size_t n;
1595 const char *match_etype;
1419 elfobj *elf; 1596 elfobj *elf;
1420 1597
1421 /* verify this is real ELF */ 1598 /* Verify this is a real ELF */
1422 if ((elf = _readelf_fd(filename, fd, len, !fix_elf)) == NULL) { 1599 if ((elf = _readelf_fd(filename, fd, len, !fix_elf)) == NULL) {
1423 if (be_verbose > 2) printf("%s: not an ELF\n", filename); 1600 if (be_verbose > 2) printf("%s: not an ELF\n", filename);
1424 return ret; 1601 return 2;
1425 } 1602 }
1603
1604 /* Possibly filter based on ELF bitness */
1426 switch (match_bits) { 1605 switch (match_bits) {
1427 case 32: 1606 case 32:
1428 if (elf->elf_class != ELFCLASS32) 1607 if (elf->elf_class != ELFCLASS32)
1429 goto label_done; 1608 goto done;
1430 break; 1609 break;
1431 case 64: 1610 case 64:
1432 if (elf->elf_class != ELFCLASS64) 1611 if (elf->elf_class != ELFCLASS64)
1433 goto label_done; 1612 goto done;
1434 break; 1613 break;
1435 default: break;
1436 } 1614 }
1437 if (match_etypes) { 1615
1438 char sbuf[126]; 1616 /* Possibly filter based on the ELF's e_type field */
1439 strncpy(sbuf, match_etypes, sizeof(sbuf)); 1617 array_for_each(match_etypes, n, match_etype)
1440 if (strchr(match_etypes, ',') != NULL) {
1441 char *p;
1442 while ((p = strrchr(sbuf, ',')) != NULL) {
1443 *p = 0;
1444 if (etype_lookup(p+1) == get_etype(elf)) 1618 if (etype_lookup(match_etype) == get_etype(elf))
1445 goto label_ret; 1619 goto scanit;
1446 } 1620 if (array_cnt(match_etypes))
1447 }
1448 if (etype_lookup(sbuf) != get_etype(elf))
1449 goto label_done; 1621 goto done;
1450 }
1451 1622
1452label_ret: 1623 scanit:
1453 ret = scanelf_elfobj(elf); 1624 ret = scanelf_elfobj(elf);
1454 1625
1455label_done: 1626 done:
1456 unreadelf(elf); 1627 unreadelf(elf);
1457 return ret; 1628 return ret;
1458} 1629}
1459 1630
1460/* scan an archive of elfs */ 1631/* scan an archive of elfs */
1483 munmap(ar_buffer, len); 1654 munmap(ar_buffer, len);
1484 1655
1485 return 0; 1656 return 0;
1486} 1657}
1487/* scan a file which may be an elf or an archive or some other magical beast */ 1658/* 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) 1659static int scanelf_fileat(int dir_fd, const char *filename, const struct stat *st_cache)
1489{ 1660{
1490 const struct stat *st = st_cache; 1661 const struct stat *st = st_cache;
1491 struct stat symlink_st; 1662 struct stat symlink_st;
1492 int fd; 1663 int fd;
1493 1664
1494 /* always handle regular files and handle symlinked files if no -y */ 1665 /* always handle regular files and handle symlinked files if no -y */
1495 if (S_ISLNK(st->st_mode)) { 1666 if (S_ISLNK(st->st_mode)) {
1496 if (!scan_symlink) return 1; 1667 if (!scan_symlink)
1668 return 1;
1497 stat(filename, &symlink_st); 1669 fstatat(dir_fd, filename, &symlink_st, 0);
1498 st = &symlink_st; 1670 st = &symlink_st;
1499 } 1671 }
1500 1672
1501 if (!S_ISREG(st->st_mode)) { 1673 if (!S_ISREG(st->st_mode)) {
1502 if (be_verbose > 2) printf("%s: skipping non-file\n", filename); 1674 if (be_verbose > 2) printf("%s: skipping non-file\n", filename);
1505 1677
1506 if (match_perms) { 1678 if (match_perms) {
1507 if ((st->st_mode | match_perms) != st->st_mode) 1679 if ((st->st_mode | match_perms) != st->st_mode)
1508 return 1; 1680 return 1;
1509 } 1681 }
1510 if ((fd=open(filename, (fix_elf ? O_RDWR : O_RDONLY))) == -1) 1682 fd = openat(dir_fd, filename, (fix_elf ? O_RDWR : O_RDONLY) | O_CLOEXEC);
1683 if (fd == -1) {
1684 if (fix_elf && errno == ETXTBSY)
1685 warnp("%s: could not fix", filename);
1686 else if (be_verbose > 2)
1687 printf("%s: skipping file: %s\n", filename, strerror(errno));
1511 return 1; 1688 return 1;
1689 }
1512 1690
1513 if (scanelf_elf(filename, fd, st->st_size) == 1 && scan_archives) 1691 if (scanelf_elf(filename, fd, st->st_size) == 2) {
1514 /* if it isn't an ELF, maybe it's an .a archive */ 1692 /* if it isn't an ELF, maybe it's an .a archive */
1693 if (scan_archives)
1515 scanelf_archive(filename, fd, st->st_size); 1694 scanelf_archive(filename, fd, st->st_size);
1516 1695
1696 /*
1697 * unreadelf() implicitly closes its fd, so only close it
1698 * when we are returning it in the non-ELF case
1699 */
1517 close(fd); 1700 close(fd);
1701 }
1702
1518 return 0; 1703 return 0;
1519} 1704}
1520 1705
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 */ 1706/* scan a directory for ET_EXEC files and print when we find one */
1532static int scanelf_dir(const char *path) 1707static int scanelf_dirat(int dir_fd, const char *path)
1533{ 1708{
1534 register DIR *dir; 1709 register DIR *dir;
1535 register struct dirent *dentry; 1710 register struct dirent *dentry;
1536 struct stat st_top, st; 1711 struct stat st_top, st;
1537 char buf[__PAX_UTILS_PATH_MAX]; 1712 char buf[__PAX_UTILS_PATH_MAX], *subpath;
1538 char _path[__PAX_UTILS_PATH_MAX];
1539 size_t pathlen = 0, len = 0; 1713 size_t pathlen = 0, len = 0;
1540 int ret = 0; 1714 int ret = 0;
1541 1715 int subdir_fd;
1542 path = maybe_add_root(path, _path);
1543 1716
1544 /* make sure path exists */ 1717 /* make sure path exists */
1545 if (lstat(path, &st_top) == -1) { 1718 if (fstatat(dir_fd, path, &st_top, AT_SYMLINK_NOFOLLOW) == -1) {
1546 if (be_verbose > 2) printf("%s: does not exist\n", path); 1719 if (be_verbose > 2) printf("%s: does not exist\n", path);
1547 return 1; 1720 return 1;
1548 } 1721 }
1549 1722
1550 /* ok, if it isn't a directory, assume we can open it */ 1723 /* ok, if it isn't a directory, assume we can open it */
1551 if (!S_ISDIR(st_top.st_mode)) { 1724 if (!S_ISDIR(st_top.st_mode))
1552 return scanelf_file(path, &st_top); 1725 return scanelf_fileat(dir_fd, path, &st_top);
1553 }
1554 1726
1555 /* now scan the dir looking for fun stuff */ 1727 /* now scan the dir looking for fun stuff */
1556 if ((dir = opendir(path)) == NULL) { 1728 subdir_fd = openat(dir_fd, path, O_RDONLY|O_CLOEXEC);
1557 warnf("could not opendir %s: %s", path, strerror(errno)); 1729 if (subdir_fd == -1)
1730 dir = NULL;
1731 else
1732 dir = fdopendir(subdir_fd);
1733 if (dir == NULL) {
1734 if (subdir_fd != -1)
1735 close(subdir_fd);
1736 else if (be_verbose > 2)
1737 printf("%s: skipping dir: %s\n", path, strerror(errno));
1558 return 1; 1738 return 1;
1559 } 1739 }
1560 if (be_verbose > 1) printf("%s: scanning dir\n", path); 1740 if (be_verbose > 1) printf("%s: scanning dir\n", path);
1561 1741
1562 pathlen = strlen(path); 1742 subpath = stpcpy(buf, path);
1743 if (subpath[-1] != '/')
1744 *subpath++ = '/';
1745 pathlen = subpath - buf;
1563 while ((dentry = readdir(dir))) { 1746 while ((dentry = readdir(dir))) {
1564 if (!strcmp(dentry->d_name, ".") || !strcmp(dentry->d_name, "..")) 1747 if (!strcmp(dentry->d_name, ".") || !strcmp(dentry->d_name, ".."))
1565 continue; 1748 continue;
1749
1750 if (fstatat(subdir_fd, dentry->d_name, &st, AT_SYMLINK_NOFOLLOW) == -1)
1751 continue;
1752
1566 len = (pathlen + 1 + strlen(dentry->d_name) + 1); 1753 len = strlen(dentry->d_name);
1567 if (len >= sizeof(buf)) { 1754 if (len + pathlen + 1 >= sizeof(buf)) {
1568 warnf("Skipping '%s': len > sizeof(buf); %lu > %lu\n", path, 1755 warnf("Skipping '%s%s': len > sizeof(buf); %zu > %zu\n",
1569 (unsigned long)len, (unsigned long)sizeof(buf)); 1756 path, dentry->d_name, len + pathlen + 1, sizeof(buf));
1570 continue; 1757 continue;
1571 } 1758 }
1572 snprintf(buf, sizeof(buf), "%s%s%s", path, (path[pathlen-1] == '/') ? "" : "/", dentry->d_name); 1759 memcpy(subpath, dentry->d_name, len);
1573 if (lstat(buf, &st) != -1) { 1760 subpath[len] = '\0';
1761
1574 if (S_ISREG(st.st_mode)) 1762 if (S_ISREG(st.st_mode))
1575 ret = scanelf_file(buf, &st); 1763 ret = scanelf_fileat(dir_fd, buf, &st);
1576 else if (dir_recurse && S_ISDIR(st.st_mode)) { 1764 else if (dir_recurse && S_ISDIR(st.st_mode)) {
1577 if (dir_crossmount || (st_top.st_dev == st.st_dev)) 1765 if (dir_crossmount || (st_top.st_dev == st.st_dev))
1578 ret = scanelf_dir(buf); 1766 ret = scanelf_dirat(dir_fd, buf);
1579 }
1580 } 1767 }
1581 } 1768 }
1582 closedir(dir); 1769 closedir(dir);
1770
1583 return ret; 1771 return ret;
1584} 1772}
1773static int scanelf_dir(const char *path)
1774{
1775 return scanelf_dirat(root_fd, root_rel_path(path));
1776}
1585 1777
1586static int scanelf_from_file(const char *filename) 1778static int scanelf_from_file(const char *filename)
1587{ 1779{
1588 FILE *fp = NULL; 1780 FILE *fp;
1589 char *p; 1781 char *p, *path;
1590 char path[__PAX_UTILS_PATH_MAX]; 1782 size_t len;
1591 int ret = 0; 1783 int ret;
1592 1784
1593 if (strcmp(filename, "-") == 0) 1785 if (strcmp(filename, "-") == 0)
1594 fp = stdin; 1786 fp = stdin;
1595 else if ((fp = fopen(filename, "r")) == NULL) 1787 else if ((fp = fopen(filename, "r")) == NULL)
1596 return 1; 1788 return 1;
1597 1789
1598 while ((fgets(path, __PAX_UTILS_PATH_MAX, fp)) != NULL) { 1790 path = NULL;
1791 len = 0;
1792 ret = 0;
1793 while (getline(&path, &len, fp) != -1) {
1599 if ((p = strchr(path, '\n')) != NULL) 1794 if ((p = strchr(path, '\n')) != NULL)
1600 *p = 0; 1795 *p = 0;
1601 search_path = path; 1796 search_path = path;
1602 ret = scanelf_dir(path); 1797 ret = scanelf_dir(path);
1603 } 1798 }
1799 free(path);
1800
1604 if (fp != stdin) 1801 if (fp != stdin)
1605 fclose(fp); 1802 fclose(fp);
1803
1606 return ret; 1804 return ret;
1607} 1805}
1608 1806
1609#if defined(__GLIBC__) || defined(__UCLIBC__) || defined(__NetBSD__) 1807#if defined(__GLIBC__) || defined(__UCLIBC__) || defined(__NetBSD__)
1610 1808
1611static int load_ld_cache_config(int i, const char *fname) 1809static int _load_ld_cache_config(const char *fname)
1612{ 1810{
1613 FILE *fp = NULL; 1811 FILE *fp = NULL;
1614 char *p; 1812 char *p, *path;
1615 char path[__PAX_UTILS_PATH_MAX]; 1813 size_t len;
1616 char _fname[__PAX_UTILS_PATH_MAX]; 1814 int curr_fd = -1;
1617 1815
1618 fname = maybe_add_root(fname, _fname); 1816 fp = fopenat_r(root_fd, root_rel_path(fname));
1619 1817 if (fp == NULL)
1620 if ((fp = fopen(fname, "r")) == NULL)
1621 return i; 1818 return -1;
1622 1819
1623 while ((fgets(path, __PAX_UTILS_PATH_MAX, fp)) != NULL) { 1820 path = NULL;
1821 len = 0;
1822 while (getline(&path, &len, fp) != -1) {
1624 if ((p = strrchr(path, '\r')) != NULL) 1823 if ((p = strrchr(path, '\r')) != NULL)
1625 *p = 0; 1824 *p = 0;
1626 if ((p = strchr(path, '\n')) != NULL) 1825 if ((p = strchr(path, '\n')) != NULL)
1627 *p = 0; 1826 *p = 0;
1628 1827
1629 /* recursive includes of the same file will make this segfault. */ 1828 /* recursive includes of the same file will make this segfault. */
1630 if ((memcmp(path, "include", 7) == 0) && isblank(path[7])) { 1829 if ((memcmp(path, "include", 7) == 0) && isblank(path[7])) {
1631 glob_t gl; 1830 glob_t gl;
1632 size_t x; 1831 size_t x;
1633 char gpath[__PAX_UTILS_PATH_MAX]; 1832 const char *gpath;
1634 1833
1635 memset(gpath, 0, sizeof(gpath)); 1834 /* re-use existing path buffer ... need to be creative */
1636 if (root)
1637 strcpy(gpath, root);
1638
1639 if (path[8] != '/') 1835 if (path[8] != '/')
1640 snprintf(gpath+strlen(gpath), sizeof(gpath)-strlen(gpath), "/etc/%s", &path[8]); 1836 gpath = memcpy(path + 3, "/etc/", 5);
1641 else 1837 else
1642 strncpy(gpath+strlen(gpath), &path[8], sizeof(gpath)-strlen(gpath)); 1838 gpath = path + 8;
1839 if (root_fd != AT_FDCWD) {
1840 if (curr_fd == -1) {
1841 curr_fd = open(".", O_RDONLY|O_CLOEXEC);
1842 if (fchdir(root_fd))
1843 errp("unable to change to root dir");
1844 }
1845 gpath = root_rel_path(gpath);
1846 }
1643 1847
1644 if (glob(gpath, 0, NULL, &gl) == 0) { 1848 if (glob(gpath, 0, NULL, &gl) == 0) {
1645 for (x = 0; x < gl.gl_pathc; ++x) { 1849 for (x = 0; x < gl.gl_pathc; ++x) {
1646 /* try to avoid direct loops */ 1850 /* try to avoid direct loops */
1647 if (strcmp(gl.gl_pathv[x], fname) == 0) 1851 if (strcmp(gl.gl_pathv[x], fname) == 0)
1648 continue; 1852 continue;
1649 i = load_ld_cache_config(i, gl.gl_pathv[x]); 1853 _load_ld_cache_config(gl.gl_pathv[x]);
1650 } 1854 }
1651 globfree(&gl); 1855 globfree(&gl);
1652 continue;
1653 } 1856 }
1857
1858 /* failed globs are ignored by glibc */
1859 continue;
1654 } 1860 }
1655 1861
1656 if (*path != '/') 1862 if (*path != '/')
1657 continue; 1863 continue;
1658 1864
1659 xarraypush(ldpaths, path, strlen(path)); 1865 xarraypush_str(ldpaths, path);
1660 } 1866 }
1867 free(path);
1661 1868
1662 fclose(fp); 1869 fclose(fp);
1870
1871 if (curr_fd != -1) {
1872 if (fchdir(curr_fd))
1873 {/* don't care */}
1874 close(curr_fd);
1875 }
1876
1663 return i; 1877 return 0;
1664} 1878}
1665 1879
1666#elif defined(__FreeBSD__) || defined(__DragonFly__) 1880#elif defined(__FreeBSD__) || defined(__DragonFly__)
1667 1881
1668static int load_ld_cache_config(int i, const char *fname) 1882static int _load_ld_cache_config(const char *fname)
1669{ 1883{
1670 FILE *fp = NULL; 1884 FILE *fp = NULL;
1671 char *b = NULL, *p; 1885 char *b = NULL, *p;
1672 struct elfhints_hdr hdr; 1886 struct elfhints_hdr hdr;
1673 char _fname[__PAX_UTILS_PATH_MAX];
1674 1887
1675 fname = maybe_add_root(fname, _fname); 1888 fp = fopenat_r(root_fd, root_rel_path(fname));
1676 1889 if (fp == NULL)
1677 if ((fp = fopen(fname, "r")) == NULL)
1678 return i; 1890 return -1;
1679 1891
1680 if (fread(&hdr, 1, sizeof(hdr), fp) != sizeof(hdr) || 1892 if (fread(&hdr, 1, sizeof(hdr), fp) != sizeof(hdr) ||
1681 hdr.magic != ELFHINTS_MAGIC || hdr.version != 1 || 1893 hdr.magic != ELFHINTS_MAGIC || hdr.version != 1 ||
1682 fseek(fp, hdr.strtab + hdr.dirlist, SEEK_SET) == -1) 1894 fseek(fp, hdr.strtab + hdr.dirlist, SEEK_SET) == -1)
1683 { 1895 {
1684 fclose(fp); 1896 fclose(fp);
1685 return i; 1897 return -1;
1686 } 1898 }
1687 1899
1688 b = xmalloc(hdr.dirlistlen + 1); 1900 b = xmalloc(hdr.dirlistlen + 1);
1689 if (fread(b, 1, hdr.dirlistlen+1, fp) != hdr.dirlistlen+1) { 1901 if (fread(b, 1, hdr.dirlistlen+1, fp) != hdr.dirlistlen+1) {
1690 fclose(fp); 1902 fclose(fp);
1691 free(b); 1903 free(b);
1692 return i; 1904 return -1;
1693 } 1905 }
1694 1906
1695 while ((p = strsep(&b, ":"))) { 1907 while ((p = strsep(&b, ":"))) {
1696 if (*p == '\0') 1908 if (*p == '\0')
1697 continue; 1909 continue;
1698 xarraypush(ldpaths, p, strlen(p)); 1910 xarraypush_str(ldpaths, p);
1699 } 1911 }
1700 1912
1701 free(b); 1913 free(b);
1702 fclose(fp); 1914 fclose(fp);
1703 return i; 1915 return 0;
1704} 1916}
1705 1917
1706#else 1918#else
1707#ifdef __ELF__ 1919#ifdef __ELF__
1708#warning Cache config support not implemented for your target 1920#warning Cache config support not implemented for your target
1709#endif 1921#endif
1710static int load_ld_cache_config(int i, const char *fname) 1922static int _load_ld_cache_config(const char *fname)
1711{ 1923{
1712 return 0; 1924 return 0;
1713} 1925}
1714#endif 1926#endif
1927
1928static void load_ld_cache_config(const char *fname)
1929{
1930 bool scan_l, scan_ul, scan_ull;
1931 size_t n;
1932 const char *ldpath;
1933
1934 _load_ld_cache_config(fname);
1935
1936 scan_l = scan_ul = scan_ull = false;
1937 array_for_each(ldpaths, n, ldpath) {
1938 if (!scan_l && !strcmp(ldpath, "/lib")) scan_l = true;
1939 if (!scan_ul && !strcmp(ldpath, "/usr/lib")) scan_ul = true;
1940 if (!scan_ull && !strcmp(ldpath, "/usr/local/lib")) scan_ull = true;
1941 }
1942
1943 if (!scan_l) xarraypush_str(ldpaths, "/lib");
1944 if (!scan_ul) xarraypush_str(ldpaths, "/usr/lib");
1945 if (!scan_ull) xarraypush_str(ldpaths, "/usr/local/lib");
1946}
1715 1947
1716/* scan /etc/ld.so.conf for paths */ 1948/* scan /etc/ld.so.conf for paths */
1717static void scanelf_ldpath(void) 1949static void scanelf_ldpath(void)
1718{ 1950{
1719 char scan_l, scan_ul, scan_ull;
1720 size_t n; 1951 size_t n;
1721 const char *ldpath; 1952 const char *ldpath;
1722 int i = 0;
1723 1953
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) { 1954 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); 1955 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} 1956}
1741 1957
1742/* scan env PATH for paths */ 1958/* scan env PATH for paths */
1743static void scanelf_envpath(void) 1959static void scanelf_envpath(void)
1744{ 1960{
1761#define PARSE_FLAGS "plRmyAXz:xetrnLibSs:k:gN:TaqvF:f:o:E:M:DIYO:ZCBhV" 1977#define PARSE_FLAGS "plRmyAXz:xetrnLibSs:k:gN:TaqvF:f:o:E:M:DIYO:ZCBhV"
1762#define a_argument required_argument 1978#define a_argument required_argument
1763static struct option const long_opts[] = { 1979static struct option const long_opts[] = {
1764 {"path", no_argument, NULL, 'p'}, 1980 {"path", no_argument, NULL, 'p'},
1765 {"ldpath", no_argument, NULL, 'l'}, 1981 {"ldpath", no_argument, NULL, 'l'},
1982 {"use-ldpath",no_argument, NULL, 129},
1766 {"root", a_argument, NULL, 128}, 1983 {"root", a_argument, NULL, 128},
1767 {"recursive", no_argument, NULL, 'R'}, 1984 {"recursive", no_argument, NULL, 'R'},
1768 {"mount", no_argument, NULL, 'm'}, 1985 {"mount", no_argument, NULL, 'm'},
1769 {"symlink", no_argument, NULL, 'y'}, 1986 {"symlink", no_argument, NULL, 'y'},
1770 {"archives", no_argument, NULL, 'A'}, 1987 {"archives", no_argument, NULL, 'A'},
1805}; 2022};
1806 2023
1807static const char * const opts_help[] = { 2024static const char * const opts_help[] = {
1808 "Scan all directories in PATH environment", 2025 "Scan all directories in PATH environment",
1809 "Scan all directories in /etc/ld.so.conf", 2026 "Scan all directories in /etc/ld.so.conf",
2027 "Use ld.so.conf to show full path (use with -r/-n)",
1810 "Root directory (use with -l or -p)", 2028 "Root directory (use with -l or -p)",
1811 "Scan directories recursively", 2029 "Scan directories recursively",
1812 "Don't recursively cross mount points", 2030 "Don't recursively cross mount points",
1813 "Don't scan symlinks", 2031 "Don't scan symlinks",
1814 "Scan archives (.a files)", 2032 "Scan archives (.a files)",
1815 "Utilize ld.so.cache information (use with -r/-n)", 2033 "Utilize ld.so.cache to show full path (use with -r/-n)",
1816 "Try and 'fix' bad things (use with -r/-e)", 2034 "Try and 'fix' bad things (use with -r/-e)",
1817 "Sets EI_PAX/PT_PAX_FLAGS to <arg> (use with -Xx)\n", 2035 "Sets EI_PAX/PT_PAX_FLAGS to <arg> (use with -Xx)\n",
1818 "Print PaX markings", 2036 "Print PaX markings",
1819 "Print GNU_STACK/PT_LOAD markings", 2037 "Print GNU_STACK/PT_LOAD markings",
1820 "Print TEXTREL information", 2038 "Print TEXTREL information",
1824 "Print BIND information", 2042 "Print BIND information",
1825 "Print SONAME information", 2043 "Print SONAME information",
1826 "Find a specified symbol", 2044 "Find a specified symbol",
1827 "Find a specified section", 2045 "Find a specified section",
1828 "Find a specified library", 2046 "Find a specified library",
1829 "Use regex matching rather than string compare (use with -s)", 2047 "Use regex rather than string compare (with -s); specify twice for case insensitive",
1830 "Locate cause of TEXTREL", 2048 "Locate cause of TEXTREL",
1831 "Print only ELF files matching etype ET_DYN,ET_EXEC ...", 2049 "Print only ELF files matching etype ET_DYN,ET_EXEC ...",
1832 "Print only ELF files matching numeric bits", 2050 "Print only ELF files matching numeric bits",
1833 "Print Endianness", 2051 "Print Endianness",
1834 "Print OSABI", 2052 "Print OSABI",
1849}; 2067};
1850 2068
1851/* display usage and exit */ 2069/* display usage and exit */
1852static void usage(int status) 2070static void usage(int status)
1853{ 2071{
1854 unsigned long i; 2072 const char a_arg[] = "<arg>";
2073 size_t a_arg_len = strlen(a_arg) + 2;
2074 size_t i;
2075 int optlen;
1855 printf("* Scan ELF binaries for stuff\n\n" 2076 printf("* Scan ELF binaries for stuff\n\n"
1856 "Usage: %s [options] <dir1/file1> [dir2 dirN file2 fileN ...]\n\n", argv0); 2077 "Usage: %s [options] <dir1/file1> [dir2 dirN file2 fileN ...]\n\n", argv0);
1857 printf("Options: -[%s]\n", PARSE_FLAGS); 2078 printf("Options: -[%s]\n", PARSE_FLAGS);
2079
2080 /* prescan the --long opt length to auto-align */
2081 optlen = 0;
1858 for (i = 0; long_opts[i].name; ++i) 2082 for (i = 0; long_opts[i].name; ++i) {
2083 int l = strlen(long_opts[i].name);
2084 if (long_opts[i].has_arg == a_argument)
2085 l += a_arg_len;
2086 optlen = max(l, optlen);
2087 }
2088
2089 for (i = 0; long_opts[i].name; ++i) {
2090 /* first output the short flag if it has one */
2091 if (long_opts[i].val > '~')
2092 printf(" ");
2093 else
2094 printf(" -%c, ", long_opts[i].val);
2095
2096 /* then the long flag */
1859 if (long_opts[i].has_arg == no_argument) 2097 if (long_opts[i].has_arg == no_argument)
1860 printf(" -%c, --%-14s* %s\n", long_opts[i].val, 2098 printf("--%-*s", optlen, long_opts[i].name);
1861 long_opts[i].name, opts_help[i]);
1862 else if (long_opts[i].val > '~')
1863 printf(" --%-7s <arg> * %s\n",
1864 long_opts[i].name, opts_help[i]);
1865 else 2099 else
1866 printf(" -%c, --%-7s <arg> * %s\n", long_opts[i].val, 2100 printf("--%s %s %*s", long_opts[i].name, a_arg,
1867 long_opts[i].name, opts_help[i]); 2101 (int)(optlen - strlen(long_opts[i].name) - a_arg_len), "");
2102
2103 /* finally the help text */
2104 printf("* %s\n", opts_help[i]);
2105 }
1868 2106
1869 puts("\nFor more information, see the scanelf(1) manpage"); 2107 puts("\nFor more information, see the scanelf(1) manpage");
1870 exit(status); 2108 exit(status);
1871} 2109}
1872 2110
1877 flags |= PF_NO##flag; \ 2115 flags |= PF_NO##flag; \
1878 } else { \ 2116 } else { \
1879 flags &= ~PF_NO##flag; \ 2117 flags &= ~PF_NO##flag; \
1880 flags |= PF_##flag; \ 2118 flags |= PF_##flag; \
1881 } 2119 }
2120static void parse_delimited(array_t *arr, char *arg, const char *delim)
2121{
2122 char *ele = strtok(arg, delim);
2123 if (!ele) /* edge case: -s '' */
2124 xarraypush_str(arr, "");
2125 while (ele) {
2126 xarraypush_str(arr, ele);
2127 ele = strtok(NULL, delim);
2128 }
2129}
1882static int parseargs(int argc, char *argv[]) 2130static int parseargs(int argc, char *argv[])
1883{ 2131{
1884 int i; 2132 int i;
1885 const char *from_file = NULL; 2133 const char *from_file = NULL;
1886 int ret = 0; 2134 int ret = 0;
2135 char load_cache_config = 0;
1887 2136
1888 opterr = 0; 2137 opterr = 0;
1889 while ((i=getopt_long(argc, argv, PARSE_FLAGS, long_opts, NULL)) != -1) { 2138 while ((i=getopt_long(argc, argv, PARSE_FLAGS, long_opts, NULL)) != -1) {
1890 switch (i) { 2139 switch (i) {
1891 2140
1899 case 'f': 2148 case 'f':
1900 if (from_file) warn("You prob don't want to specify -f twice"); 2149 if (from_file) warn("You prob don't want to specify -f twice");
1901 from_file = optarg; 2150 from_file = optarg;
1902 break; 2151 break;
1903 case 'E': 2152 case 'E':
1904 match_etypes = optarg; 2153 /* historically, this was comma delimited */
2154 parse_delimited(match_etypes, optarg, ",");
1905 break; 2155 break;
1906 case 'M': 2156 case 'M':
1907 match_bits = atoi(optarg); 2157 match_bits = atoi(optarg);
1908 if (match_bits == 0) { 2158 if (match_bits == 0) {
1909 if (strcmp(optarg, "ELFCLASS32") == 0) 2159 if (strcmp(optarg, "ELFCLASS32") == 0)
1916 if (sscanf(optarg, "%o", &match_perms) == -1) 2166 if (sscanf(optarg, "%o", &match_perms) == -1)
1917 match_bits = 0; 2167 match_bits = 0;
1918 break; 2168 break;
1919 case 'o': { 2169 case 'o': {
1920 if (freopen(optarg, "w", stdout) == NULL) 2170 if (freopen(optarg, "w", stdout) == NULL)
1921 err("Could not open output stream '%s': %s", optarg, strerror(errno)); 2171 errp("Could not freopen(%s)", optarg);
1922 break; 2172 break;
1923 } 2173 }
1924 case 'k': 2174 case 'k':
1925 xarraypush(find_section_arr, optarg, strlen(optarg)); 2175 xarraypush_str(find_section_arr, optarg);
1926 break; 2176 break;
1927 case 's': { 2177 case 's':
1928 if (find_sym) warn("You prob don't want to specify -s twice"); 2178 /* historically, this was comma delimited */
1929 find_sym = optarg; 2179 parse_delimited(find_sym_arr, optarg, ",");
1930 break; 2180 break;
1931 }
1932 case 'N': 2181 case 'N':
1933 xarraypush(find_lib_arr, optarg, strlen(optarg)); 2182 xarraypush_str(find_lib_arr, optarg);
1934 break; 2183 break;
1935 case 'F': { 2184 case 'F': {
1936 if (out_format) warn("You prob don't want to specify -F twice"); 2185 if (out_format) warn("You prob don't want to specify -F twice");
1937 out_format = optarg; 2186 out_format = optarg;
1938 break; 2187 break;
1979 ((flags & PF_RANDMMAP) && (flags & PF_NORANDMMAP)))) 2228 ((flags & PF_RANDMMAP) && (flags & PF_NORANDMMAP))))
1980 setpax = flags; 2229 setpax = flags;
1981 break; 2230 break;
1982 } 2231 }
1983 case 'Z': show_size = 1; break; 2232 case 'Z': show_size = 1; break;
1984 case 'g': g_match = 1; break; 2233 case 'g': ++g_match; break;
1985 case 'L': use_ldcache = 1; break; 2234 case 'L': load_cache_config = use_ldcache = 1; break;
1986 case 'y': scan_symlink = 0; break; 2235 case 'y': scan_symlink = 0; break;
1987 case 'A': scan_archives = 1; break; 2236 case 'A': scan_archives = 1; break;
1988 case 'C': color_init(true); break; 2237 case 'C': color_init(true); break;
1989 case 'B': show_banner = 0; break; 2238 case 'B': show_banner = 0; break;
1990 case 'l': scan_ldpath = 1; break; 2239 case 'l': load_cache_config = scan_ldpath = 1; break;
1991 case 'p': scan_envpath = 1; break; 2240 case 'p': scan_envpath = 1; break;
1992 case 'R': dir_recurse = 1; break; 2241 case 'R': dir_recurse = 1; break;
1993 case 'm': dir_crossmount = 0; break; 2242 case 'm': dir_crossmount = 0; break;
1994 case 'X': ++fix_elf; break; 2243 case 'X': ++fix_elf; break;
1995 case 'x': show_pax = 1; break; 2244 case 'x': show_pax = 1; break;
1999 case 'n': show_needed = 1; break; 2248 case 'n': show_needed = 1; break;
2000 case 'i': show_interp = 1; break; 2249 case 'i': show_interp = 1; break;
2001 case 'b': show_bind = 1; break; 2250 case 'b': show_bind = 1; break;
2002 case 'S': show_soname = 1; break; 2251 case 'S': show_soname = 1; break;
2003 case 'T': show_textrels = 1; break; 2252 case 'T': show_textrels = 1; break;
2004 case 'q': be_quiet = 1; break; 2253 case 'q': be_quiet = min(be_quiet, 20) + 1; break;
2005 case 'v': be_verbose = (be_verbose % 20) + 1; break; 2254 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; 2255 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; 2256 case 'D': show_endian = 1; break;
2008 case 'I': show_osabi = 1; break; 2257 case 'I': show_osabi = 1; break;
2009 case 'Y': show_eabi = 1; break; 2258 case 'Y': show_eabi = 1; break;
2010 case 128: 2259 case 128:
2011 root = optarg; 2260 root_fd = open(optarg, O_RDONLY|O_CLOEXEC);
2261 if (root_fd == -1)
2262 err("Could not open root: %s", optarg);
2012 break; 2263 break;
2264 case 129: load_cache_config = use_ldpath = 1; break;
2013 case ':': 2265 case ':':
2014 err("Option '%c' is missing parameter", optopt); 2266 err("Option '%c' is missing parameter", optopt);
2015 case '?': 2267 case '?':
2016 err("Unknown option '%c' or argument missing", optopt); 2268 err("Unknown option '%c' or argument missing", optopt);
2017 default: 2269 default:
2018 err("Unhandled option '%c'; please report this", i); 2270 err("Unhandled option '%c'; please report this", i);
2019 } 2271 }
2020 } 2272 }
2021 if (show_textrels && be_verbose) { 2273 if (show_textrels && be_verbose)
2022 if (which("objdump") != NULL) 2274 objdump = which("objdump", "OBJDUMP");
2023 has_objdump = 1; 2275 /* precompile all the regexes */
2276 if (g_match) {
2277 regex_t preg;
2278 const char *this_sym;
2279 size_t n;
2280 int flags = REG_EXTENDED | REG_NOSUB | (g_match > 1 ? REG_ICASE : 0);
2281
2282 array_for_each(find_sym_arr, n, this_sym) {
2283 /* see scanelf_match_symname for logic info */
2284 switch (this_sym[0]) {
2285 case '%':
2286 while (*(this_sym++))
2287 if (*this_sym == '%') {
2288 ++this_sym;
2289 break;
2290 }
2291 break;
2292 case '+':
2293 case '-':
2294 ++this_sym;
2295 break;
2296 }
2297 if (*this_sym == '*')
2298 ++this_sym;
2299
2300 ret = regcomp(&preg, this_sym, flags);
2301 if (ret) {
2302 char err[256];
2303 regerror(ret, &preg, err, sizeof(err));
2304 err("regcomp of %s failed: %s", this_sym, err);
2305 }
2306 xarraypush(find_sym_regex_arr, &preg, sizeof(preg));
2307 }
2024 } 2308 }
2025 /* flatten arrays for display */ 2309 /* flatten arrays for display */
2026 if (array_cnt(find_lib_arr)) 2310 find_sym = array_flatten_str(find_sym_arr);
2027 find_lib = array_flatten_str(find_lib_arr); 2311 find_lib = array_flatten_str(find_lib_arr);
2028 if (array_cnt(find_section_arr))
2029 find_section = array_flatten_str(find_section_arr); 2312 find_section = array_flatten_str(find_section_arr);
2030 /* let the format option override all other options */ 2313 /* let the format option override all other options */
2031 if (out_format) { 2314 if (out_format) {
2032 show_pax = show_phdr = show_textrel = show_rpath = \ 2315 show_pax = show_phdr = show_textrel = show_rpath = \
2033 show_needed = show_interp = show_bind = show_soname = \ 2316 show_needed = show_interp = show_bind = show_soname = \
2034 show_textrels = show_perms = show_endian = show_size = \ 2317 show_textrels = show_perms = show_endian = show_size = \
2062 case 'i': show_interp = 1; break; 2345 case 'i': show_interp = 1; break;
2063 case 'b': show_bind = 1; break; 2346 case 'b': show_bind = 1; break;
2064 case 'S': show_soname = 1; break; 2347 case 'S': show_soname = 1; break;
2065 case 'T': show_textrels = 1; break; 2348 case 'T': show_textrels = 1; break;
2066 default: 2349 default:
2067 err("Invalid format specifier '%c' (byte %i)", 2350 err("invalid format specifier '%c' (byte %i)",
2068 out_format[i], i+1); 2351 out_format[i], i+1);
2069 } 2352 }
2070 } 2353 }
2071 2354
2072 /* construct our default format */ 2355 /* construct our default format */
2095 if (!be_quiet) xstrcat(&out_format, "%F ", &fmt_len); 2378 if (!be_quiet) xstrcat(&out_format, "%F ", &fmt_len);
2096 } 2379 }
2097 if (be_verbose > 2) printf("Format: %s\n", out_format); 2380 if (be_verbose > 2) printf("Format: %s\n", out_format);
2098 2381
2099 /* now lets actually do the scanning */ 2382 /* now lets actually do the scanning */
2100 if (scan_ldpath || use_ldcache) 2383 if (load_cache_config)
2101 load_ld_cache_config(0, __PAX_UTILS_DEFAULT_LD_CACHE_CONFIG); 2384 load_ld_cache_config(__PAX_UTILS_DEFAULT_LD_CACHE_CONFIG);
2102 if (scan_ldpath) scanelf_ldpath(); 2385 if (scan_ldpath) scanelf_ldpath();
2103 if (scan_envpath) scanelf_envpath(); 2386 if (scan_envpath) scanelf_envpath();
2104 if (!from_file && optind == argc && ttyname(0) == NULL && !scan_ldpath && !scan_envpath) 2387 if (!from_file && optind == argc && ttyname(0) == NULL && !scan_ldpath && !scan_envpath)
2105 from_file = "-"; 2388 from_file = "-";
2106 if (from_file) { 2389 if (from_file) {
2112 while (optind < argc) { 2395 while (optind < argc) {
2113 search_path = argv[optind++]; 2396 search_path = argv[optind++];
2114 ret = scanelf_dir(search_path); 2397 ret = scanelf_dir(search_path);
2115 } 2398 }
2116 2399
2400#ifdef __PAX_UTILS_CLEANUP
2117 /* clean up */ 2401 /* clean up */
2118 xarrayfree(ldpaths); 2402 xarrayfree(ldpaths);
2403 xarrayfree(find_sym_arr);
2119 xarrayfree(find_lib_arr); 2404 xarrayfree(find_lib_arr);
2120 xarrayfree(find_section_arr); 2405 xarrayfree(find_section_arr);
2406 free(find_sym);
2121 free(find_lib); 2407 free(find_lib);
2122 free(find_section); 2408 free(find_section);
2409 {
2410 size_t n;
2411 regex_t *preg;
2412 array_for_each(find_sym_regex_arr, n, preg)
2413 regfree(preg);
2414 xarrayfree(find_sym_regex_arr);
2415 }
2123 2416
2124 if (ldcache != 0) 2417 if (ldcache != 0)
2125 munmap(ldcache, ldcache_size); 2418 munmap(ldcache, ldcache_size);
2419#endif
2420
2126 return ret; 2421 return ret;
2127} 2422}
2128 2423
2129static char **get_split_env(const char *envvar) 2424static char **get_split_env(const char *envvar)
2130{ 2425{
2187 ret = parseargs(argc, argv); 2482 ret = parseargs(argc, argv);
2188 fclose(stdout); 2483 fclose(stdout);
2189#ifdef __PAX_UTILS_CLEANUP 2484#ifdef __PAX_UTILS_CLEANUP
2190 cleanup(); 2485 cleanup();
2191 warn("The calls to add/delete heap should be off:\n" 2486 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" 2487 "\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"); 2488 "\t- 1 per QA_TEXTRELS/QA_EXECSTACK/QA_WX_LOAD");
2194#endif 2489#endif
2195 return ret; 2490 return ret;
2196} 2491}
2197 2492

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

  ViewVC Help
Powered by ViewVC 1.1.20