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

bsd-user: start to cleanup the mess

Browse Source 
A number of small cleanups to get started. All the checkpatch.pl warnings for
 bsdload.c have been fixed, as well as a warning from qemu.h (though more remain
 and this patch series fails the format check still). I've also fixed a
 compile-time warning about a missing break.
 -----BEGIN PGP SIGNATURE-----
 Comment: GPGTools - https://gpgtools.org
 
 iQIzBAABCgAdFiEEIDX4lLAKo898zeG3bBzRKH2wEQAFAmCMJNgACgkQbBzRKH2w
 EQCRExAAoTm1MkLxUE/J9HSm2EOX+XVdaYveUlStCKXfDg7eI+S6rf7LVLQhLeKc
 8r8MiSCQN2w4ggQcagZtx23hseEuy6Ilr+OYLZPNVVAwMmtwVjCloLp1kcq+Y3Kd
 nefapBB2WitKDR6cK8j8h6F+mZbAMSkToZiholaapL1Uo5qOQoOvClcSAe3yzJD6
 JUdBmmLN4qD/w+h//xGYj/DBBglH1t9nUzdhbNtH52j3tPZuwJ8Wti6UB1EuyDXO
 WuxiiuHj7C4QqFOAtQ0uL+SoQ6P4sygxG8ppa88osvPBO2Mizj+s4RQdL2insOGM
 1YaqliUgUk/Apg06dSHrZby9lpFyt4k01cJCIkH1Vz7GdkHYQYH+o+o1rvKMoVhK
 dwxhS7orFbc8tuBwGw534X2KX/lsV+C7QuEuq8JWpNf5XYznD9HDkHaA9hr6efXC
 JeWSY5+yhVVeBFKMgyKuUOYMAePhLcx8nSWj37Sc49L16kfuGKZow7qPwVv4KuiZ
 acFZxsFuqt13vP1cm+8s+W/UHmxw+z7LZzHEzwHr7t53ZM//WRE78jmLNpAIAW1P
 1gVlMwoQcQG9RVpH6xaWW2PFo9zpb6G3PMxwTKB9wfAhkIKsthPfU5yDkC1nBSeM
 Rq8vJr5tu91VvYp9PMzb81mW1y4A3Yv4+xUIqRzL5RspIt/eOkI=
 =MbYr
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/bsdimp/tags/pull-bsd-user-20210430' into staging

bsd-user: start to cleanup the mess

A number of small cleanups to get started. All the checkpatch.pl warnings for
bsdload.c have been fixed, as well as a warning from qemu.h (though more remain
and this patch series fails the format check still). I've also fixed a
compile-time warning about a missing break.

# gpg: Signature made Fri 30 Apr 2021 16:40:08 BST
# gpg:                using RSA key 2035F894B00AA3CF7CCDE1B76C1CD1287DB01100
# gpg: Good signature from "Warner Losh <wlosh@netflix.com>" [unknown]
# gpg:                 aka "Warner Losh <imp@bsdimp.com>" [unknown]
# gpg:                 aka "Warner Losh <imp@freebsd.org>" [unknown]
# gpg:                 aka "Warner Losh <imp@village.org>" [unknown]
# gpg:                 aka "Warner Losh <wlosh@bsdimp.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2035 F894 B00A A3CF 7CCD  E1B7 6C1C D128 7DB0 1100

* remotes/bsdimp/tags/pull-bsd-user-20210430:
  bsd-user: style tweak: Put {} around all if/else/for statements
  bsd-user: put back a break; that had gone missing...
  bsd-user: style tweak: return is not a function, eliminate ()
  bsd-user: style tweak: keyword space (
  bsd-user: whitespace changes

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-05-04 10:58:55 +01:00
commit 3e13d8e34b
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
bsd-user/bsdload.c
View File

@ -13,22 +13,23 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,
void *host_ptr;
host_ptr = lock_user(VERIFY_WRITE, dest, len, 0);
if (!host_ptr)
if (!host_ptr) {
return -TARGET_EFAULT;
}
memcpy(host_ptr, src, len);
unlock_user(host_ptr, dest, 1);
return 0;
}
static int count(char ** vec)
static int count(char **vec)
{
int i;
for(i = 0; *vec; i++) {
for (i = 0; *vec; i++) {
vec++;
}
return(i);
return i;
}
static int prepare_binprm(struct linux_binprm *bprm)
@ -37,23 +38,23 @@ static int prepare_binprm(struct linux_binprm *bprm)
int mode;
int retval;
if(fstat(bprm->fd, &st) < 0) {
return(-errno);
if (fstat(bprm->fd, &st) < 0) {
return -errno;
}
mode = st.st_mode;
if(!S_ISREG(mode)) { /* Must be regular file */
return(-EACCES);
if (!S_ISREG(mode)) { /* Must be regular file */
return -EACCES;
}
if(!(mode & 0111)) { /* Must have at least one execute bit set */
return(-EACCES);
if (!(mode & 0111)) { /* Must have at least one execute bit set */
return -EACCES;
}
bprm->e_uid = geteuid();
bprm->e_gid = getegid();
/* Set-uid? */
if(mode & S_ISUID) {
if (mode & S_ISUID) {
bprm->e_uid = st.st_uid;
}
@ -69,16 +70,14 @@ static int prepare_binprm(struct linux_binprm *bprm)
memset(bprm->buf, 0, sizeof(bprm->buf));
retval = lseek(bprm->fd, 0L, SEEK_SET);
if(retval >= 0) {
if (retval >= 0) {
retval = read(bprm->fd, bprm->buf, 128);
}
if(retval < 0) {
if (retval < 0) {
perror("prepare_binprm");
exit(-1);
/* return(-errno); */
}
else {
return(retval);
} else {
return retval;
}
}
@ -125,19 +124,21 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp,
return sp;
}
int loader_exec(const char * filename, char ** argv, char ** envp,
struct target_pt_regs * regs, struct image_info *infop)
int loader_exec(const char *filename, char **argv, char **envp,
struct target_pt_regs *regs, struct image_info *infop)
{
struct linux_binprm bprm;
int retval;
int i;
bprm.p = TARGET_PAGE_SIZE*MAX_ARG_PAGES-sizeof(unsigned int);
for (i=0 ; i<MAX_ARG_PAGES ; i++) /* clear page-table */
bprm.p = TARGET_PAGE_SIZE * MAX_ARG_PAGES - sizeof(unsigned int);
for (i = 0 ; i < MAX_ARG_PAGES ; i++) { /* clear page-table */
bprm.page[i] = NULL;
}
retval = open(filename, O_RDONLY);
if (retval < 0)
if (retval < 0) {
return retval;
}
bprm.fd = retval;
bprm.filename = (char *)filename;
bprm.argc = count(argv);
@ -147,27 +148,27 @@ int loader_exec(const char * filename, char ** argv, char ** envp,
retval = prepare_binprm(&bprm);
if(retval>=0) {
if (retval >= 0) {
if (bprm.buf[0] == 0x7f
&& bprm.buf[1] == 'E'
&& bprm.buf[2] == 'L'
&& bprm.buf[3] == 'F') {
retval = load_elf_binary(&bprm,regs,infop);
retval = load_elf_binary(&bprm, regs, infop);
} else {
fprintf(stderr, "Unknown binary format\n");
return -1;
}
}
if(retval>=0) {
if (retval >= 0) {
/* success. Initialize important registers */
do_init_thread(regs, infop);
return retval;
}
/* Something went wrong, return the inode and free the argument pages*/
for (i=0 ; i<MAX_ARG_PAGES ; i++) {
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
g_free(bprm.page[i]);
}
return(retval);
return retval;
}

4
bsd-user/qemu.h
View File

@ -233,7 +233,7 @@ static inline bool access_ok(int type, abi_ulong addr, abi_ulong size)
#define __put_user(x, hptr)\
({\
int size = sizeof(*hptr);\
switch(size) {\
switch (size) {\
case 1:\
*(uint8_t *)(hptr) = (uint8_t)(typeof(*hptr))(x);\
break;\
@ -255,7 +255,7 @@ static inline bool access_ok(int type, abi_ulong addr, abi_ulong size)
#define __get_user(x, hptr) \
({\
int size = sizeof(*hptr);\
switch(size) {\
switch (size) {\
case 1:\
x = (typeof(*hptr))*(uint8_t *)(hptr);\
break;\

1
bsd-user/syscall.c
View File

@ -199,6 +199,7 @@ static int sysctl_oldcvt(void *holdp, size_t holdlen, uint32_t kind)
#else
case CTLTYPE_LONG:
*(uint64_t *)holdp = tswap64(*(long *)holdp);
break;
case CTLTYPE_ULONG:
*(uint64_t *)holdp = tswap64(*(unsigned long *)holdp);
break;