summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authordchagin <dchagin@FreeBSD.org>2014-06-17 05:21:48 +0000
committerdchagin <dchagin@FreeBSD.org>2014-06-17 05:21:48 +0000
commit4fc656028601c789cff990c31467dfbad11e4241 (patch)
tree0123a2eeea4b11a43b292dd772b9d165cb1fd66a /sys/amd64
parente3bd23da81912e3b08d4e9709b65dcf85b19c67f (diff)
downloadFreeBSD-src-4fc656028601c789cff990c31467dfbad11e4241.zip
FreeBSD-src-4fc656028601c789cff990c31467dfbad11e4241.tar.gz
Revert MFC r266925 because it can lead to instant panic at fexecve():
To allow to run interpreter itself add a new ELF branding type. Pointed out by: kib, mjg
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/linux32/linux32_sysvec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 9b5c555..c06ce11 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -1083,7 +1083,7 @@ static Elf32_Brandinfo linux_brand = {
.sysvec = &elf_linux_sysvec,
.interp_newpath = NULL,
.brand_note = &linux32_brandnote,
- .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE | BI_CAN_EXEC_INTERP
+ .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE
};
static Elf32_Brandinfo linux_glibc2brand = {
@@ -1095,7 +1095,7 @@ static Elf32_Brandinfo linux_glibc2brand = {
.sysvec = &elf_linux_sysvec,
.interp_newpath = NULL,
.brand_note = &linux32_brandnote,
- .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE | BI_CAN_EXEC_INTERP
+ .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE
};
Elf32_Brandinfo *linux_brandlist[] = {
OpenPOWER on IntegriCloud