| Message ID | 20200302193153.66415-1-yuanzi@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] linux-user: Add AT_EXECFN auxval | expand |
Le 02/03/2020 à 20:31, Lirong Yuan a écrit : > This change adds the support for AT_EXECFN auxval. > > Signed-off-by: Lirong Yuan <yuanzi@google.com> > --- > Changelog since v1: > - remove implementation for AT_EXECFD auxval. > > linux-user/elfload.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/linux-user/elfload.c b/linux-user/elfload.c > index db748c5877..8198be0446 100644 > --- a/linux-user/elfload.c > +++ b/linux-user/elfload.c > @@ -1573,7 +1573,7 @@ struct exec > ~(abi_ulong)(TARGET_ELF_EXEC_PAGESIZE-1)) > #define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1)) > > -#define DLINFO_ITEMS 15 > +#define DLINFO_ITEMS 16 > > static inline void memcpy_fromfs(void * to, const void * from, unsigned long n) > { > @@ -2037,6 +2037,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, > NEW_AUX_ENT(AT_CLKTCK, (abi_ulong) sysconf(_SC_CLK_TCK)); > NEW_AUX_ENT(AT_RANDOM, (abi_ulong) u_rand_bytes); > NEW_AUX_ENT(AT_SECURE, (abi_ulong) qemu_getauxval(AT_SECURE)); > + NEW_AUX_ENT(AT_EXECFN, info->file_string); > > #ifdef ELF_HWCAP2 > NEW_AUX_ENT(AT_HWCAP2, (abi_ulong) ELF_HWCAP2); > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Le 02/03/2020 à 20:31, Lirong Yuan a écrit : > This change adds the support for AT_EXECFN auxval. > > Signed-off-by: Lirong Yuan <yuanzi@google.com> > --- > Changelog since v1: > - remove implementation for AT_EXECFD auxval. > > linux-user/elfload.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/linux-user/elfload.c b/linux-user/elfload.c > index db748c5877..8198be0446 100644 > --- a/linux-user/elfload.c > +++ b/linux-user/elfload.c > @@ -1573,7 +1573,7 @@ struct exec > ~(abi_ulong)(TARGET_ELF_EXEC_PAGESIZE-1)) > #define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1)) > > -#define DLINFO_ITEMS 15 > +#define DLINFO_ITEMS 16 > > static inline void memcpy_fromfs(void * to, const void * from, unsigned long n) > { > @@ -2037,6 +2037,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, > NEW_AUX_ENT(AT_CLKTCK, (abi_ulong) sysconf(_SC_CLK_TCK)); > NEW_AUX_ENT(AT_RANDOM, (abi_ulong) u_rand_bytes); > NEW_AUX_ENT(AT_SECURE, (abi_ulong) qemu_getauxval(AT_SECURE)); > + NEW_AUX_ENT(AT_EXECFN, info->file_string); > > #ifdef ELF_HWCAP2 > NEW_AUX_ENT(AT_HWCAP2, (abi_ulong) ELF_HWCAP2); > Applied to my linux-user branch. Thanks, Laurent
On Tue, Mar 3, 2020 at 1:40 AM Laurent Vivier <laurent@vivier.eu> wrote: > > Le 02/03/2020 à 20:31, Lirong Yuan a écrit : > > This change adds the support for AT_EXECFN auxval. > > > > Signed-off-by: Lirong Yuan <yuanzi@google.com> > > --- > > Changelog since v1: > > - remove implementation for AT_EXECFD auxval. > > > > linux-user/elfload.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/linux-user/elfload.c b/linux-user/elfload.c > > index db748c5877..8198be0446 100644 > > --- a/linux-user/elfload.c > > +++ b/linux-user/elfload.c > > @@ -1573,7 +1573,7 @@ struct exec > > ~(abi_ulong)(TARGET_ELF_EXEC_PAGESIZE-1)) > > #define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1)) > > > > -#define DLINFO_ITEMS 15 > > +#define DLINFO_ITEMS 16 > > > > static inline void memcpy_fromfs(void * to, const void * from, unsigned long n) > > { > > @@ -2037,6 +2037,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, > > NEW_AUX_ENT(AT_CLKTCK, (abi_ulong) sysconf(_SC_CLK_TCK)); > > NEW_AUX_ENT(AT_RANDOM, (abi_ulong) u_rand_bytes); > > NEW_AUX_ENT(AT_SECURE, (abi_ulong) qemu_getauxval(AT_SECURE)); > > + NEW_AUX_ENT(AT_EXECFN, info->file_string); > > > > #ifdef ELF_HWCAP2 > > NEW_AUX_ENT(AT_HWCAP2, (abi_ulong) ELF_HWCAP2); > > > > Applied to my linux-user branch. > > Thanks, > Laurent Awesome, thanks for the review! :) Regards, Lirong
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index db748c5877..8198be0446 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1573,7 +1573,7 @@ struct exec ~(abi_ulong)(TARGET_ELF_EXEC_PAGESIZE-1)) #define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1)) -#define DLINFO_ITEMS 15 +#define DLINFO_ITEMS 16 static inline void memcpy_fromfs(void * to, const void * from, unsigned long n) { @@ -2037,6 +2037,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, NEW_AUX_ENT(AT_CLKTCK, (abi_ulong) sysconf(_SC_CLK_TCK)); NEW_AUX_ENT(AT_RANDOM, (abi_ulong) u_rand_bytes); NEW_AUX_ENT(AT_SECURE, (abi_ulong) qemu_getauxval(AT_SECURE)); + NEW_AUX_ENT(AT_EXECFN, info->file_string); #ifdef ELF_HWCAP2 NEW_AUX_ENT(AT_HWCAP2, (abi_ulong) ELF_HWCAP2);
This change adds the support for AT_EXECFN auxval. Signed-off-by: Lirong Yuan <yuanzi@google.com> --- Changelog since v1: - remove implementation for AT_EXECFD auxval. linux-user/elfload.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)