diff options
| author | bz <bz@FreeBSD.org> | 2009-08-30 14:38:17 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2009-08-30 14:38:17 +0000 |
| commit | 840afe36da862eaa9287a996548968cbbb30c461 (patch) | |
| tree | 5dcb3648d211506c50b4c9ede361f0ea41795981 /sys/sys/imgact_elf.h | |
| parent | 5fb95a2095446b02c21f0e4ecad4b7bff41c856a (diff) | |
| download | FreeBSD-src-840afe36da862eaa9287a996548968cbbb30c461.zip FreeBSD-src-840afe36da862eaa9287a996548968cbbb30c461.tar.gz | |
Make sure FreeBSD binaries without .note.ABI-tag section work
correctly and do not match a colliding Debian GNU/kFreeBSD
brandinfo statements.
For this mark the Debian GNU/kFreeBSD brandinfo that it must have
an .note.ABI-tag section and ignore the old EI_OSABI brandinfo
when comparing a possibly colliding set of options.
Due to SYSINIT we add the brandinfo in a non-deterministic order,
so native FreeBSD is not always first. We may want to consider
to force native FreeBSD to come first as well.
The only way a problem could currently be noticed is when running an
i386 binary without the .note.ABI-tag on amd64 and the Debian GNU/kFreeBSD
brandinfo was matched first, as the fallback to ld-elf32.so.1 does
not exist in that case.
Reported and tested by: ticso
In collaboration with: kib
MFC after: 3 days
Diffstat (limited to 'sys/sys/imgact_elf.h')
| -rw-r--r-- | sys/sys/imgact_elf.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h index 3eecf85..4ccee5d 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -74,8 +74,9 @@ typedef struct { const char *interp_newpath; int flags; Elf_Brandnote *brand_note; -#define BI_CAN_EXEC_DYN 0x0001 -#define BI_BRAND_NOTE 0x0002 +#define BI_CAN_EXEC_DYN 0x0001 +#define BI_BRAND_NOTE 0x0002 /* May have note.ABI-tag section. */ +#define BI_BRAND_NOTE_MANDATORY 0x0004 /* Must have note.ABI-tag section. */ } __ElfN(Brandinfo); __ElfType(Auxargs); |
