OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: Fix style problems in linuxload.c 

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210706234932.356913-3-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2021-07-06 16:48:58 -07:00 committed by Laurent Vivier
parent 7aa9fe3a52
commit a46955ff61
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
linux-user/linuxload.c
View File

@ -1,59 +1,57 @@
/* Code for loading Linux executables. Mostly linux kernel code. */ /* Code for loading Linux executables. Mostly linux kernel code. */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu.h" #include "qemu.h"
#define NGROUPS 32 #define NGROUPS 32
/* ??? This should really be somewhere else. */ /* ??? This should really be somewhere else. */
abi_long memcpy_to_target(abi_ulong dest, const void *src, abi_long memcpy_to_target(abi_ulong dest, const void *src, unsigned long len)
unsigned long len)
{ {
void *host_ptr; void *host_ptr;
host_ptr = lock_user(VERIFY_WRITE, dest, len, 0); host_ptr = lock_user(VERIFY_WRITE, dest, len, 0);
if (!host_ptr) if (!host_ptr) {
return -TARGET_EFAULT; return -TARGET_EFAULT;
}
memcpy(host_ptr, src, len); memcpy(host_ptr, src, len);
unlock_user(host_ptr, dest, 1); unlock_user(host_ptr, dest, 1);
return 0; return 0;
} }
static int count(char ** vec) static int count(char **vec)
{ {
int i; int i;
for(i = 0; *vec; i++) { for (i = 0; *vec; i++) {
vec++; vec++;
} }
return i;
return(i);
} }
static int prepare_binprm(struct linux_binprm *bprm) static int prepare_binprm(struct linux_binprm *bprm)
{ {
struct stat st; struct stat st;
int mode; int mode;
int retval; int retval;
if(fstat(bprm->fd, &st) < 0) { if (fstat(bprm->fd, &st) < 0) {
return(-errno); return -errno;
} }
mode = st.st_mode; mode = st.st_mode;
if(!S_ISREG(mode)) { /* Must be regular file */ if (!S_ISREG(mode)) { /* Must be regular file */
return(-EACCES); return -EACCES;
} }
if(!(mode & 0111)) { /* Must have at least one execute bit set */ if (!(mode & 0111)) { /* Must have at least one execute bit set */
return(-EACCES); return -EACCES;
} }
bprm->e_uid = geteuid(); bprm->e_uid = geteuid();
bprm->e_gid = getegid(); bprm->e_gid = getegid();
/* Set-uid? */ /* Set-uid? */
if(mode & S_ISUID) { if (mode & S_ISUID) {
bprm->e_uid = st.st_uid; bprm->e_uid = st.st_uid;
} }
@ -125,8 +123,8 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp,
} }
int loader_exec(int fdexec, const char *filename, char **argv, char **envp, int loader_exec(int fdexec, const char *filename, char **argv, char **envp,
struct target_pt_regs * regs, struct image_info *infop, struct target_pt_regs *regs, struct image_info *infop,
struct linux_binprm *bprm) struct linux_binprm *bprm)
{ {
int retval; int retval;
@ -139,7 +137,7 @@ int loader_exec(int fdexec, const char *filename, char **argv, char **envp,
retval = prepare_binprm(bprm); retval = prepare_binprm(bprm);
if(retval>=0) { if (retval >= 0) {
if (bprm->buf[0] == 0x7f if (bprm->buf[0] == 0x7f
&& bprm->buf[1] == 'E' && bprm->buf[1] == 'E'
&& bprm->buf[2] == 'L' && bprm->buf[2] == 'L'
@ -157,11 +155,11 @@ int loader_exec(int fdexec, const char *filename, char **argv, char **envp,
} }
} }
if(retval>=0) { if (retval >= 0) {
/* success. Initialize important registers */ /* success. Initialize important registers */
do_init_thread(regs, infop); do_init_thread(regs, infop);
return retval; return retval;
} }
return(retval); return retval;
} }