linux user: fixed proc myself execfd behaviour, added tests for proc myself fd
PATCH 1/2 linux user: fixed proc myself execfd behaviour, added tests for proc myself fd
Signed-off-by Andrew Aladjev <[email protected]>
--- linux-user/elfload.c | 3 +- linux-user/main.c | 11 ++++- linux-user/syscall.c | 7 ++- tests/tcg/multiarch/linux-test.c | 85 ++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 5 deletions(-)
linux-user/elfload.c +2 -1
@@ -2363,6 +2363,7 @@ void probe_guest_base(const char *image_name, abi_ulong guest_loaddr, IMAGE_NAME is the filename of the image, to use in error messages. IMAGE_FD is the open file descriptor for the image. + WARNING : IMAGE_FD won't be closed. BPRM_BUF is a copy of the beginning of the file; this of course contains the elf file header at offset 0. It is assumed that this
@@ -2632,7 +2633,6 @@ static void load_elf_image(const char *image_name, int image_fd,mmap_unlock (); -close (image_fd);return ; exit_read:
@@ -2666,6 +2666,7 @@ static void load_elf_interp(const char *filename, struct image_info *info, }load_elf_image (filename, fd, info,NULL , bprm_buf); +close (fd);return ; exit_perror:
linux-user/main.c +9 -2
@@ -629,6 +629,7 @@ int main(int argc, char **argv, char **envp)int target_argc;int i;int ret; +int at_execfd;int execfd;int log_mask;unsigned long max_reserved_va;
@@ -690,13 +691,15 @@ int main(int argc, char **argv, char **envp)init_qemu_uname_release (); - execfd =qemu_getauxval (AT_EXECFD ); -if (execfd ==0 ) { + at_execfd =qemu_getauxval (AT_EXECFD ); +if (at_execfd ==0 ) { execfd =open (exec_path,O_RDONLY );if (execfd <0 ) {printf ("Error while loading %s: %s\n" , exec_path,strerror (errno));_exit (EXIT_FAILURE ); } + }else { + execfd = at_execfd; }if (cpu_model ==NULL ) {
@@ -811,6 +814,10 @@ int main(int argc, char **argv, char **envp) ret =loader_exec (execfd, exec_path, target_argv, target_environ, regs, info, &bprm); +/* We shouldn't close at_execfd, it may be used later. */ +if (execfd != at_execfd) { +close (execfd); + }if (ret !=0 ) {printf ("Error while loading %s: %s\n" , exec_path,strerror (-ret));_exit (EXIT_FAILURE );
linux-user/syscall.c +5 -2
@@ -7613,8 +7613,11 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, };if (is_proc_myself (pathname,"exe" )) { -int execfd =qemu_getauxval (AT_EXECFD ); -return execfd ? execfd :safe_openat (dirfd, exec_path, flags, mode); +/* +* We can't use AT_EXECFD here. +* User can close provided fd and another user will receive closed fd. +*/ +return safe_openat (dirfd, exec_path, flags, mode); }for (fake_open = fakes; fake_open->filename; fake_open++) {
tests/tcg/multiarch/linux-test.c +85 -0
96 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 2/2 linux user: refactored is proc functions for syscalls
Signed-off-by Andrew Aladjev <[email protected]>
--- linux-user/syscall.c | 81 ++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 25 deletions(-)
linux-user/syscall.c +56 -25
@@ -7482,38 +7482,69 @@ static int open_self_auxv(void *cpu_env, int fd)return 0 ; } -static int is_proc_myself (const char *filename,const char *entry) -{ -if (!strncmp (filename,"/proc/" ,strlen ("/proc/" ))) { - filename +=strlen ("/proc/" ); -if (!strncmp (filename,"self/" ,strlen ("self/" ))) { - filename +=strlen ("self/" ); - }else if (*filename >='1' && *filename <='9' ) { -char myself[80 ]; -snprintf (myself,sizeof (myself),"%d/" ,getpid ()); -if (!strncmp (filename, myself,strlen (myself))) { - filename +=strlen (myself); - }else { -return 0 ; - } - }else { -return 0 ; - } -if (!strcmp (filename, entry)) { -return 1 ; +#define PROC "/proc/" +#define SELF "self/" + +#define STARTS_WITH (path,CONSTANT ) ( \ + strlen(path) >= strlen(CONSTANT) && \ + strncmp(path, CONSTANT, strlen(CONSTANT)) == 0 \ +) + +static inline char *scope_to_proc (const char *path) +{ +if (STARTS_WITH (path,PROC )) { +return (char *)path +strlen (PROC ); + } + +return NULL ; +} + +static inline char *scope_to_proc_myself (const char *path) +{ +char *scope_path =scope_to_proc (path); +if (scope_path ==NULL ) { +return NULL ; + } + +if (STARTS_WITH (scope_path,SELF )) { +return scope_path +strlen (SELF ); + } + +if (strlen (scope_path) >=1 && + *scope_path >='1' && *scope_path <='9' ) { +char pid_path[80 ]; +snprintf (pid_path,sizeof (pid_path),"%d/" ,getpid ()); +if (STARTS_WITH (scope_path, pid_path)) { +return scope_path +strlen (pid_path); } } -return 0 ; + +return NULL ; }#if defined(HOST_WORDS_BIGENDIAN ) != defined(TARGET_WORDS_BIGENDIAN ) || \ defined(TARGET_SPARC ) || defined(TARGET_M68K ) || defined(TARGET_HPPA ) -static int is_proc (const char *filename,const char *entry) +static int is_proc (const char *path,const char *entry) { -return strcmp (filename, entry) ==0 ; +char *scope_path =scope_to_proc (path); +if (scope_path ==NULL ) { +return 0 ; + } + +return strcmp (scope_path, entry) ==0 ; }#endif +static int is_proc_myself (const char *path,const char *entry) +{ +char *scope_path =scope_to_proc_myself (path); +if (scope_path ==NULL ) { +return 0 ; + } + +return strcmp (scope_path, entry) ==0 ; +} +#if defined(HOST_WORDS_BIGENDIAN ) != defined(TARGET_WORDS_BIGENDIAN )static int open_net_route (void *cpu_env,int fd) {
@@ -7601,13 +7632,13 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, { "auxv", open_self_auxv, is_proc_myself }, { "cmdline", open_self_cmdline, is_proc_myself }, #if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN) - { "/proc/net/route", open_net_route, is_proc }, + { "net/route", open_net_route, is_proc }, #endif #if defined(TARGET_SPARC) || defined(TARGET_HPPA) - { "/proc/cpuinfo", open_cpuinfo, is_proc }, + { "cpuinfo", open_cpuinfo, is_proc }, #endif #if defined(TARGET_M68K) - { "/proc/hardware", open_hardware, is_proc }, + { "hardware", open_hardware, is_proc }, #endif { NULL, NULL, NULL } };
Signature · 1 line
2.26.2