diff options
| author | Bryan Cantrill <bryan@joyent.com> | 2014-11-10 23:32:36 +0000 |
|---|---|---|
| committer | Bryan Cantrill <bryan@joyent.com> | 2014-11-10 23:32:36 +0000 |
| commit | fcd3b89ae8204f3a672987db07df59fcc3879c45 (patch) | |
| tree | c1c57ec577396274a121fb2e1b9bb6f0bca15d34 /usr/src/uts/common/sys | |
| parent | 2012725bb9382d7af477a7b32fa2dfe38697a2af (diff) | |
| download | illumos-joyent-fcd3b89ae8204f3a672987db07df59fcc3879c45.tar.gz | |
OS-3517 lx brand: branded zones don't interpret .interp section
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/brand.h | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/exec.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/common/sys/brand.h b/usr/src/uts/common/sys/brand.h index a3add10399..b95648de4c 100644 --- a/usr/src/uts/common/sys/brand.h +++ b/usr/src/uts/common/sys/brand.h @@ -21,7 +21,7 @@ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2014 Joyent, Inc. All rights reserved. + * Copyright (c) 2014, Joyent, Inc. All rights reserved. */ #ifndef _SYS_BRAND_H @@ -186,7 +186,7 @@ extern void brand_solaris_copy_procdata(proc_t *, proc_t *, struct brand *); extern int brand_solaris_elfexec(vnode_t *, execa_t *, uarg_t *, intpdata_t *, int, long *, int, caddr_t, cred_t *, int, - struct brand *, char *, char *, char *, char *, char *); + struct brand *, char *, char *, char *); extern void brand_solaris_exec(struct brand *); extern int brand_solaris_fini(char **, struct modlinkage *, struct brand *); diff --git a/usr/src/uts/common/sys/exec.h b/usr/src/uts/common/sys/exec.h index 8509d51a9f..73c5cccee7 100644 --- a/usr/src/uts/common/sys/exec.h +++ b/usr/src/uts/common/sys/exec.h @@ -244,7 +244,7 @@ extern void exec_set_sp(size_t); extern int elfexec(vnode_t *, execa_t *, uarg_t *, intpdata_t *, int, long *, int, caddr_t, cred_t *, int); extern int mapexec_brand(vnode_t *, uarg_t *, Ehdr *, Addr *, - intptr_t *, caddr_t, int *, caddr_t *, caddr_t *, size_t *, + intptr_t *, caddr_t, char **, caddr_t *, caddr_t *, size_t *, uintptr_t *, uintptr_t *); #endif /* !_ELF32_COMPAT */ @@ -252,7 +252,7 @@ extern int mapexec_brand(vnode_t *, uarg_t *, Ehdr *, Addr *, extern int elf32exec(vnode_t *, execa_t *, uarg_t *, intpdata_t *, int, long *, int, caddr_t, cred_t *, int); extern int mapexec32_brand(vnode_t *, uarg_t *, Elf32_Ehdr *, Elf32_Addr *, - intptr_t *, caddr_t, int *, caddr_t *, caddr_t *, size_t *, + intptr_t *, caddr_t, char **, caddr_t *, caddr_t *, size_t *, uintptr_t *, uintptr_t *); #endif /* _LP64 */ |