generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 5b44655f: am 7e6a5773: Merge "Use the AT_SECURE auxv flag to determine whether to enable secure mode."

Browse Source 
* commit '5b44655f22dd05c7cd8afcd218102616a6f5f4da':
  Use the AT_SECURE auxv flag to determine whether to enable secure mode.
This commit is contained in:
Jean-Baptiste Queru 2012-01-20 17:23:51 -08:00 committed by Android Git Automerger
commit c3650d6a4b
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
linker/linker.c
View File

@ -2135,7 +2135,7 @@ static unsigned __linker_init_post_relocation(unsigned **elfdata)
int argc = (int) *elfdata; int argc = (int) *elfdata;
char **argv = (char**) (elfdata + 1); char **argv = (char**) (elfdata + 1);
unsigned *vecs = (unsigned*) (argv + argc + 1); unsigned *vecs = (unsigned*) (argv + argc + 1), *v;
soinfo *si; soinfo *si;
struct link_map * map; struct link_map * map;
const char *ldpath_env = NULL; const char *ldpath_env = NULL;
@ -2163,12 +2163,23 @@ static unsigned __linker_init_post_relocation(unsigned **elfdata)
*/ */
__tls_area[TLS_SLOT_BIONIC_PREINIT] = elfdata; __tls_area[TLS_SLOT_BIONIC_PREINIT] = elfdata;
/* Are we setuid? */
program_is_setuid = (getuid() != geteuid()) || (getgid() != getegid());
/* Initialize environment functions, and get to the ELF aux vectors table */ /* Initialize environment functions, and get to the ELF aux vectors table */
vecs = linker_env_init(vecs); vecs = linker_env_init(vecs);
/* Check auxv for AT_SECURE first to see if program is setuid, setgid,
has file caps, or caused a SELinux/AppArmor domain transition. */
for (v = vecs; v[0]; v += 2) {
if (v[0] == AT_SECURE) {
/* kernel told us whether to enable secure mode */
program_is_setuid = v[1];
goto sanitize;
}
}
/* Kernel did not provide AT_SECURE - fall back on legacy test. */
program_is_setuid = (getuid() != geteuid()) || (getgid() != getegid());
sanitize:
/* Sanitize environment if we're loading a setuid program */ /* Sanitize environment if we're loading a setuid program */
if (program_is_setuid) if (program_is_setuid)
linker_env_secure(); linker_env_secure();