Commit 1b4e6e8c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20171120' into staging 



late linux-user fixes for Qemu 2.11

# gpg: Signature made Mon 20 Nov 2017 21:19:00 GMT
# gpg:                using RSA key 0xB44890DEDE3C9BC0
# gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>"
# gpg:                 aka "Riku Voipio <riku.voipio@linaro.org>"
# Primary key fingerprint: FF82 03C8 C391 98AE 0581  41EF B448 90DE DE3C 9BC0

* remotes/riku/tags/pull-linux-user-20171120:
  linux-user: Fix calculation of auxv length
  linux-user: Handle rt_sigaction correctly for SPARC
  linux-user/sparc: Put address for data faults where linux-user expects it
  linux-user/ppc: Report correct fault address for data faults
  linux-user/s390x: Mask si_addr for SIGSEGV
  linux-user: return EINVAL from prctl(PR_*_SECCOMP)
  linux-user: fix 'finshed' typo in comment
  linux-user/syscall.c: Handle SH4's exceptional alignment for p{read, write}64
  linux-user: Handle TARGET_MAP_STACK and TARGET_MAP_HUGETLB
  linux-user/hppa: Fix TARGET_F_RDLCK, TARGET_F_WRLCK, TARGET_F_UNLCK
  linux-user/hppa: Fix TARGET_MAP_TYPE
  linux-user/hppa: Fix typo for TARGET_NR_epoll_wait
  linux-user/hppa: Fix cpu_clone_regs
  linux-user/hppa: Fix TARGET_SA_* defines
  linux-user: Restrict usage of sa_restorer

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5f49d73c f516511e

linux-user/elfload.c

+9 −2
Original line number Diff line number Diff line
@@ -1732,6 +1732,8 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, 
#ifdef ELF_HWCAP2

    size += 2;

#endif

    info->auxv_len = size * n;



    size += envc + argc + 2;

    size += 1;  /* argc itself */

    size *= n;
@@ -1760,7 +1762,6 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, 
        put_user_ual(val, u_auxv); u_auxv += n; \

    } while(0)



    /* There must be exactly DLINFO_ITEMS entries here.  */

#ifdef ARCH_DLINFO

    /*

     * ARCH_DLINFO must come first so platform specific code can enforce
@@ -1768,6 +1769,9 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, 
     */

    ARCH_DLINFO;

#endif

    /* There must be exactly DLINFO_ITEMS entries here, or the assert

     * on info->auxv_len will trigger.

     */

    NEW_AUX_ENT(AT_PHDR, (abi_ulong)(info->load_addr + exec->e_phoff));

    NEW_AUX_ENT(AT_PHENT, (abi_ulong)(sizeof (struct elf_phdr)));

    NEW_AUX_ENT(AT_PHNUM, (abi_ulong)(exec->e_phnum));
@@ -1793,7 +1797,10 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, 
    NEW_AUX_ENT (AT_NULL, 0);

#undef NEW_AUX_ENT



    info->auxv_len = u_argv - info->saved_auxv;

    /* Check that our initial calculation of the auxv length matches how much

     * we actually put into it.

     */

    assert(info->auxv_len == u_auxv - info->saved_auxv);



    put_user_ual(argc, u_argc);

linux-user/hppa/syscall_nr.h

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ 
#define TARGET_NR_lookup_dcookie    223

#define TARGET_NR_epoll_create      224

#define TARGET_NR_epoll_ctl         225

#define TARGET_NR_epill_wait        226

#define TARGET_NR_epoll_wait        226

#define TARGET_NR_remap_file_pages  227

#define TARGET_NR_semtimedop        228

#define TARGET_NR_mq_open           229

linux-user/hppa/target_cpu.h

+4 −0
Original line number Diff line number Diff line
@@ -24,7 +24,11 @@ static inline void cpu_clone_regs(CPUHPPAState *env, target_ulong newsp) 
    if (newsp) {

        env->gr[30] = newsp;

    }

    /* Indicate child in return value.  */

    env->gr[28] = 0;

    /* Return from the syscall.  */

    env->iaoq_f = env->gr[31];

    env->iaoq_b = env->gr[31] + 4;

}



static inline void cpu_set_tls(CPUHPPAState *env, target_ulong newtls)

linux-user/main.c

+6 −2
Original line number Diff line number Diff line
@@ -1420,7 +1420,7 @@ void cpu_loop(CPUPPCState *env) 
                info.si_code = TARGET_SEGV_MAPERR;

                break;

            }

            info._sifields._sigfault._addr = env->nip;

            info._sifields._sigfault._addr = env->spr[SPR_DAR];

            queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

            break;

        case POWERPC_EXCP_ISI:      /* Instruction storage exception         */
@@ -3238,6 +3238,10 @@ void cpu_loop(CPUAlphaState *env) 
#endif /* TARGET_ALPHA */



#ifdef TARGET_S390X



/* s390x masks the fault address it reports in si_addr for SIGSEGV and SIGBUS */

#define S390X_FAIL_ADDR_MASK -4096LL



void cpu_loop(CPUS390XState *env)

{

    CPUState *cs = CPU(s390_env_get_cpu(env));
@@ -3294,7 +3298,7 @@ void cpu_loop(CPUS390XState *env) 
                sig = TARGET_SIGSEGV;

                /* XXX: check env->error_code */

                n = TARGET_SEGV_MAPERR;

                addr = env->__excp_addr;

                addr = env->__excp_addr & S390X_FAIL_ADDR_MASK;

                goto do_signal;

            case PGM_EXECUTE:

            case PGM_SPECIFICATION:

linux-user/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ int do_sigaction(int sig, const struct target_sigaction *act, 
    if (oact) {

        __put_user(k->_sa_handler, &oact->_sa_handler);

        __put_user(k->sa_flags, &oact->sa_flags);

#if !defined(TARGET_MIPS)

#ifdef TARGET_ARCH_HAS_SA_RESTORER

        __put_user(k->sa_restorer, &oact->sa_restorer);

#endif

        /* Not swapped.  */
@@ -787,7 +787,7 @@ int do_sigaction(int sig, const struct target_sigaction *act, 
        /* FIXME: This is not threadsafe.  */

        __get_user(k->_sa_handler, &act->_sa_handler);

        __get_user(k->sa_flags, &act->sa_flags);

#if !defined(TARGET_MIPS)

#ifdef TARGET_ARCH_HAS_SA_RESTORER

        __get_user(k->sa_restorer, &act->sa_restorer);

#endif

        /* To be swapped in target_to_host_sigset.  */