mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
[PATCH] binflt_elf: remove more casts
Remove redundant casts from NEW_AUX_ENT() arguments in fs/binfmt_elf.c Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
f4e5cc2c44
commit
785d55708c
1 changed files with 10 additions and 9 deletions
|
@ -177,10 +177,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Create the ELF interpreter info */
|
/* Create the ELF interpreter info */
|
||||||
elf_info = (elf_addr_t *) current->mm->saved_auxv;
|
elf_info = (elf_addr_t *)current->mm->saved_auxv;
|
||||||
#define NEW_AUX_ENT(id, val) \
|
#define NEW_AUX_ENT(id, val) \
|
||||||
do { \
|
do { \
|
||||||
elf_info[ei_index++] = id; elf_info[ei_index++] = val; \
|
elf_info[ei_index++] = id; \
|
||||||
|
elf_info[ei_index++] = val; \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#ifdef ARCH_DLINFO
|
#ifdef ARCH_DLINFO
|
||||||
|
@ -199,17 +200,17 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
|
||||||
NEW_AUX_ENT(AT_BASE, interp_load_addr);
|
NEW_AUX_ENT(AT_BASE, interp_load_addr);
|
||||||
NEW_AUX_ENT(AT_FLAGS, 0);
|
NEW_AUX_ENT(AT_FLAGS, 0);
|
||||||
NEW_AUX_ENT(AT_ENTRY, exec->e_entry);
|
NEW_AUX_ENT(AT_ENTRY, exec->e_entry);
|
||||||
NEW_AUX_ENT(AT_UID, (elf_addr_t)tsk->uid);
|
NEW_AUX_ENT(AT_UID, tsk->uid);
|
||||||
NEW_AUX_ENT(AT_EUID, (elf_addr_t)tsk->euid);
|
NEW_AUX_ENT(AT_EUID, tsk->euid);
|
||||||
NEW_AUX_ENT(AT_GID, (elf_addr_t)tsk->gid);
|
NEW_AUX_ENT(AT_GID, tsk->gid);
|
||||||
NEW_AUX_ENT(AT_EGID, (elf_addr_t)tsk->egid);
|
NEW_AUX_ENT(AT_EGID, tsk->egid);
|
||||||
NEW_AUX_ENT(AT_SECURE, (elf_addr_t)security_bprm_secureexec(bprm));
|
NEW_AUX_ENT(AT_SECURE, security_bprm_secureexec(bprm));
|
||||||
if (k_platform) {
|
if (k_platform) {
|
||||||
NEW_AUX_ENT(AT_PLATFORM,
|
NEW_AUX_ENT(AT_PLATFORM,
|
||||||
(elf_addr_t)(unsigned long)u_platform);
|
(elf_addr_t)(unsigned long)u_platform);
|
||||||
}
|
}
|
||||||
if (bprm->interp_flags & BINPRM_FLAGS_EXECFD) {
|
if (bprm->interp_flags & BINPRM_FLAGS_EXECFD) {
|
||||||
NEW_AUX_ENT(AT_EXECFD, (elf_addr_t)bprm->interp_data);
|
NEW_AUX_ENT(AT_EXECFD, bprm->interp_data);
|
||||||
}
|
}
|
||||||
#undef NEW_AUX_ENT
|
#undef NEW_AUX_ENT
|
||||||
/* AT_NULL is zero; clear the rest too */
|
/* AT_NULL is zero; clear the rest too */
|
||||||
|
|
Loading…
Reference in a new issue