Hi Leon, On 30/01/15 15:08, Leon Alrae wrote: > Simple "hello world" MIPS N32 userland program crashes with segfault due to > incorrectly defined stat structure in QEMU. > > Correct "target_stat" definition to match kernel's "stat64" as in MIPS N32 > there are only plain "stat" syscalls using 64-bit structure. > > Reported-by: Daniel Sanders <daniel.sand...@imgtec.com> > Signed-off-by: Leon Alrae <leon.al...@imgtec.com> > Tested-by: Daniel Sanders <daniel.sand...@imgtec.com>
Reviewed-by: James Hogan <james.ho...@imgtec.com>
Cheers
James
> ---
> linux-user/syscall_defs.h | 86
> +++++++++++------------------------------------
> 1 file changed, 19 insertions(+), 67 deletions(-)
>
> diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
> index ebb3be1..0fc4317 100644
> --- a/linux-user/syscall_defs.h
> +++ b/linux-user/syscall_defs.h
> @@ -1600,73 +1600,25 @@ struct target_stat {
> #elif defined(TARGET_ABI_MIPSN32)
>
> struct target_stat {
> - unsigned st_dev;
> - int st_pad1[3]; /* Reserved for network id */
> - unsigned int st_ino;
> - unsigned int st_mode;
> - unsigned int st_nlink;
> - int st_uid;
> - int st_gid;
> - unsigned st_rdev;
> - unsigned int st_pad2[2];
> - unsigned int st_size;
> - unsigned int st_pad3;
> - /*
> - * Actually this should be timestruc_t st_atime, st_mtime and st_ctime
> - * but we don't have it under Linux.
> - */
> - unsigned int target_st_atime;
> - unsigned int target_st_atime_nsec;
> - unsigned int target_st_mtime;
> - unsigned int target_st_mtime_nsec;
> - unsigned int target_st_ctime;
> - unsigned int target_st_ctime_nsec;
> - unsigned int st_blksize;
> - unsigned int st_blocks;
> - unsigned int st_pad4[14];
> -};
> -
> -/*
> - * This matches struct stat64 in glibc2.1, hence the absolutely insane
> - * amounts of padding around dev_t's. The memory layout is the same as of
> - * struct stat of the 64-bit kernel.
> - */
> -
> -#define TARGET_HAS_STRUCT_STAT64
> -struct target_stat64 {
> - unsigned int st_dev;
> - unsigned int st_pad0[3]; /* Reserved for st_dev expansion */
> -
> - target_ulong st_ino;
> -
> - unsigned int st_mode;
> - unsigned int st_nlink;
> -
> - int st_uid;
> - int st_gid;
> -
> - unsigned int st_rdev;
> - unsigned int st_pad1[3]; /* Reserved for st_rdev expansion */
> -
> - int st_size;
> -
> - /*
> - * Actually this should be timestruc_t st_atime, st_mtime and st_ctime
> - * but we don't have it under Linux.
> - */
> - int target_st_atime;
> - unsigned int target_st_atime_nsec; /* Reserved for st_atime
> expansion */
> -
> - int target_st_mtime;
> - unsigned int target_st_mtime_nsec; /* Reserved for st_mtime
> expansion */
> -
> - int target_st_ctime;
> - unsigned int target_st_ctime_nsec; /* Reserved for st_ctime
> expansion */
> -
> - unsigned int st_blksize;
> - unsigned int st_pad2;
> -
> - int st_blocks;
> + abi_ulong st_dev;
> + abi_ulong st_pad0[3]; /* Reserved for st_dev expansion */
> + uint64_t st_ino;
> + unsigned int st_mode;
> + unsigned int st_nlink;
> + int st_uid;
> + int st_gid;
> + abi_ulong st_rdev;
> + abi_ulong st_pad1[3]; /* Reserved for st_rdev expansion */
> + int64_t st_size;
> + abi_long target_st_atime;
> + abi_ulong target_st_atime_nsec; /* Reserved for st_atime
> expansion */
> + abi_long target_st_mtime;
> + abi_ulong target_st_mtime_nsec; /* Reserved for st_mtime
> expansion */
> + abi_long target_st_ctime;
> + abi_ulong target_st_ctime_nsec; /* Reserved for st_ctime
> expansion */
> + abi_ulong st_blksize;
> + abi_ulong st_pad2;
> + int64_t st_blocks;
> };
>
> #elif defined(TARGET_ABI_MIPSO32)
>
signature.asc
Description: OpenPGP digital signature
