From patchwork Wed Jul 17 14:54:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1133352 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45pgLt3Qb3z9sN4 for ; Thu, 18 Jul 2019 00:56:06 +1000 (AEST) Received: from localhost ([::1]:58128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnlLg-0006Jm-Iz for incoming@patchwork.ozlabs.org; Wed, 17 Jul 2019 10:56:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48179) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnlL8-0004Hp-Qw for qemu-devel@nongnu.org; Wed, 17 Jul 2019 10:55:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnlL4-0000mB-Jf for qemu-devel@nongnu.org; Wed, 17 Jul 2019 10:55:30 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:32921) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnlL4-0000hI-8o for qemu-devel@nongnu.org; Wed, 17 Jul 2019 10:55:26 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MlfCk-1iDi8q3HQg-00ikdO; Wed, 17 Jul 2019 16:54:38 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 16:54:16 +0200 Message-Id: <20190717145418.23883-2-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190717145418.23883-1-laurent@vivier.eu> References: <20190717145418.23883-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:/uU3Iw6FRkYlIr/YSJIBPhpggc9tLECLeDfacBj1X6GtMOXvI2J 7uc6i/JqcxopF3YG9yby5J5R47On3cLqHSCEN8Xo5Puln7/apPCPdTJPe3nur2NZSqMMh0l OppuH2pS08gJoWH96+OaSHEebGR3w5Zwtefbo/ROw/Z9wuO0VM+MY5SJU7PYGmUAZILQ3vx xhZbqgpoCxaMYi76167Kg== X-UI-Out-Filterresults: notjunk:1; V03:K0:tjIhIcauqoE=:xvlqiaOOeahjicl8gbn8eO i0bJrjnb3crBQiE46CtkgEuG1RC28lkLXsGw/ikntGMn8UX6qxiNsUCwW96CsNt/n6EL/mYHO 0VNpw5Ape5J4QI5bBhse1pcMn+7LL4n2nmWqEDHIFtQiz6U6Wa7VX4LTc/RAxNYcQBnd72AbW SEvwLpV7+1fGY4LERJ0e94GSdHyPRxbVAJAi/Rj9Hu0hvycET+FidbsoFrbAvTbacq0HB/W7u BbCzgRJeNDVdgKhAkorNdWRdwOcvd0Z500xlDyPBkJtoG/HZy0l4VSCG3mbSiqfqqYBJfe44Z UUuzDZX4WtTdRb4PYlkaIeOassdH7oCeF9+nvexD+y9bpnrnGNFdQa5yiF8hu8wivYEC//5Pk 1hzmF8oCdwIfRIE6dcbN0B9VqnEn67auDqmDZMYFDuifK3KGpabs8UTEiREOqBFq9D/PEyLjt mdHuCNka56tLgYJNCv++mNl/O1pYusVT01IMY2bSAGHMjSaG3RAOloIZWhOkp8qujSuKu1G/7 wC/eGVQlrxOgAz/2ZYM7xsHhWSLaUamU5w2R29IJkDJo1tfZnv/2BTHlsv5n64mCVFFfyZuKf 2pzf44XxNovU0EMV2CFpzLI5J5hQaKGbb1JUeLKnFinMf2ozoKdrS103lrHKbKPLvIrjbS883 u9yNWkOXrXqPIGI5fdfZswb9nUvAGYIF3XQyQAJkoCLYbANlqqdWOVpg+NfVmnDZoHwuHYtLh 60Orvy7cmUsHGxVIkMlyqy4a7+GK6FwgdFbr7g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 1/3] linux-user: Fix structure target_ucontext for MIPS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dragan Mladjenovic , Aleksandar Rikalo , Riku Voipio , Laurent Vivier , Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Aleksandar Markovic Structure ucontext for MIPS is defined in the following way in Linux kernel: (arch/mips/include/uapi/asm/ucontext.h, lines 54-64) struct ucontext { /* Historic fields matching asm-generic */ unsigned long uc_flags; struct ucontext *uc_link; stack_t uc_stack; struct sigcontext uc_mcontext; sigset_t uc_sigmask; /* Extended context structures may follow ucontext */ unsigned long long uc_extcontext[0]; }; Fix the structure target_ucontext for MIPS to reflect the definition above, except the correction for field uc_extcontext, which will follow at some later time. Fixes: 94c5495d Reported-by: Dragan Mladjenovic Signed-off-by: Aleksandar Markovic Reviewed-by: Laurent Vivier Message-Id: <1562931470-3700-2-git-send-email-aleksandar.markovic@rt-rk.com> Signed-off-by: Laurent Vivier --- linux-user/mips/signal.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/linux-user/mips/signal.c b/linux-user/mips/signal.c index 6aa303ec9c16..455a8a229a83 100644 --- a/linux-user/mips/signal.c +++ b/linux-user/mips/signal.c @@ -71,10 +71,9 @@ struct sigframe { }; struct target_ucontext { - target_ulong tuc_flags; - target_ulong tuc_link; + abi_ulong tuc_flags; + abi_ulong tuc_link; target_stack_t tuc_stack; - target_ulong pad0; struct target_sigcontext tuc_mcontext; target_sigset_t tuc_sigmask; }; From patchwork Wed Jul 17 14:54:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1133351 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45pgLd5wjxz9s3l for ; Thu, 18 Jul 2019 00:55:53 +1000 (AEST) Received: from localhost ([::1]:58120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnlLT-0005UH-Vf for incoming@patchwork.ozlabs.org; Wed, 17 Jul 2019 10:55:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48137) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnlL6-00048h-LH for qemu-devel@nongnu.org; Wed, 17 Jul 2019 10:55:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnlL4-0000mK-NA for qemu-devel@nongnu.org; Wed, 17 Jul 2019 10:55:28 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:50325) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnlL4-0000gT-Af for qemu-devel@nongnu.org; Wed, 17 Jul 2019 10:55:26 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MBUuV-1hao5I2cRT-00Cyit; Wed, 17 Jul 2019 16:54:40 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 16:54:17 +0200 Message-Id: <20190717145418.23883-3-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190717145418.23883-1-laurent@vivier.eu> References: <20190717145418.23883-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:AsnCKoZWY20fwQZVAGyf46INCrxxv52sh05yeEeozj/wDSXriOV 0je6caW2OC5oYRP2xhhNu8Wup6rl/cCfAYKEMfZM56Jjzafq+5tgL/VcHKzd+hbpK2Dqhc9 qw+HknWdUMhyVMrpM6OGHjkz8JTQhPZH7EozRtLOiXSsvOcotFtVL0JH6WVrpXAvDq1Nuj6 /B8lMi/l2PD4vMatsu/rw== X-UI-Out-Filterresults: notjunk:1; V03:K0:GXsZzXj+5GU=:mbcVg92YA6NA/iE/mW62Eb cEk8jKsxV0nlvXpbvkMPRWewh3mFnEJvR3SBmR167C57tnM4nLr7u1wqH/PMwLGgvheRr6sQc LZ32/nTj0NJ3tHb2rD8e7a/RxGJR15cVDdUtswyA180cbALEFIQ8bdXJNCBpckZCMOd4GYrjN 25PXLKiwaRF22cA+FJkNyFc6WG7U2l9fh9tcYRGui14uEtTSeN4S5yQ9BcRnTep2rsRIXWTFm uoNw0G/M9neOFxXwC1BQS59h1hYFfwqgVZtOE+wrQ/Ol2mLjmeZtbw/AD27pUz8KeoHO2B3Kp cPpjL24V/Q+fBAALIPI0MbTGjSoQ7cVVXez7NQidytGox1F3hfBCZz/kye7uFSp96wpORbI59 RglTuj/xHNPeGGte7YwOnPYWjIfldYe8o4DNKmUZtDX8UtGbuOMHoCeuTIxqGRY9vjxzBs8Kk P4/xxEK6+2zO1VjJKcC3qdtQRHQs+jy0Zu6g/G9iCdBNLUXZqQdEgeQiKR+BmeGvVmnNCk3C4 8TZmk9ZTI9NjUrUYyVhkweoE38blolfZeib6OELODcb3iuigv6esfpkDXJd+LhRk0OTll8mRZ 8GCi6mi29O1VBbSdJtQ6ufIa4sItsnCPDpLCsJcWNtP7eYaqcAbvlAflUKv78NvI2cH8cWTJ+ 0W1nsjDgDM6joMzynCB5qzmmNTTpC/UST34Zj2MMTHrNHJFoSEdpuaQKbfeYDs3l5LDFPhnzT YXh6hzIPEDToosO2UuUFj3zBGwmNRyu2ynVd4i3uGNyzROOXzLlK/qAikEA= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 2/3] linux-user: fix to handle variably sized SIOCGSTAMP with new kernels X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Arnd Bergmann , Aleksandar Rikalo , Riku Voipio , Laurent Vivier , Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé The SIOCGSTAMP symbol was previously defined in the asm-generic/sockios.h header file. QEMU sees that header indirectly via sys/socket.h In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115 the asm-generic/sockios.h header no longer defines SIOCGSTAMP. Instead it provides only SIOCGSTAMP_OLD, which only uses a 32-bit time_t on 32-bit architectures. The linux/sockios.h header then defines SIOCGSTAMP using either SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. If SIOCGSTAMP_NEW is used, then the tv_sec field is 64-bit even on 32-bit architectures To cope with this we must now convert the old and new type from the target to the host one. Signed-off-by: Daniel P. Berrangé Signed-off-by: Laurent Vivier Reviewed-by: Arnd Bergmann Message-Id: <20190714135423.1274-1-laurent@vivier.eu> Signed-off-by: Laurent Vivier --- linux-user/ioctls.h | 11 ++- linux-user/syscall.c | 140 +++++++++++++++++++++++++++++-------- linux-user/syscall_defs.h | 30 +++++++- linux-user/syscall_types.h | 6 -- 4 files changed, 149 insertions(+), 38 deletions(-) diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index 5e84dc7c3a77..9a4957840ac4 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -222,8 +222,15 @@ IOCTL(SIOCGIWNAME, IOC_W | IOC_R, MK_PTR(MK_STRUCT(STRUCT_char_ifreq))) IOCTL(SIOCSPGRP, IOC_W, MK_PTR(TYPE_INT)) /* pid_t */ IOCTL(SIOCGPGRP, IOC_R, MK_PTR(TYPE_INT)) /* pid_t */ - IOCTL(SIOCGSTAMP, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timeval))) - IOCTL(SIOCGSTAMPNS, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timespec))) + + { TARGET_SIOCGSTAMP_OLD, SIOCGSTAMP, "IOCGSTAMP_OLD", IOC_R, \ + do_ioctl_SIOCGSTAMP }, + { TARGET_SIOCGSTAMPNS_OLD, SIOCGSTAMPNS, "IOCGSTAMPNS_OLD", IOC_R, \ + do_ioctl_SIOCGSTAMPNS }, + { TARGET_SIOCGSTAMP_NEW, SIOCGSTAMP, "IOCGSTAMP_NEW", IOC_R, \ + do_ioctl_SIOCGSTAMP }, + { TARGET_SIOCGSTAMPNS_NEW, SIOCGSTAMPNS, "IOCGSTAMPNS_NEW", IOC_R, \ + do_ioctl_SIOCGSTAMPNS }, IOCTL(RNDGETENTCNT, IOC_R, MK_PTR(TYPE_INT)) IOCTL(RNDADDTOENTCNT, IOC_W, MK_PTR(TYPE_INT)) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 39a37496fed5..8367cb138dfe 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -1126,8 +1127,9 @@ static inline abi_long copy_from_user_timeval(struct timeval *tv, { struct target_timeval *target_tv; - if (!lock_user_struct(VERIFY_READ, target_tv, target_tv_addr, 1)) + if (!lock_user_struct(VERIFY_READ, target_tv, target_tv_addr, 1)) { return -TARGET_EFAULT; + } __get_user(tv->tv_sec, &target_tv->tv_sec); __get_user(tv->tv_usec, &target_tv->tv_usec); @@ -1142,8 +1144,26 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr, { struct target_timeval *target_tv; - if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0)) + if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0)) { + return -TARGET_EFAULT; + } + + __put_user(tv->tv_sec, &target_tv->tv_sec); + __put_user(tv->tv_usec, &target_tv->tv_usec); + + unlock_user_struct(target_tv, target_tv_addr, 1); + + return 0; +} + +static inline abi_long copy_to_user_timeval64(abi_ulong target_tv_addr, + const struct timeval *tv) +{ + struct target__kernel_sock_timeval *target_tv; + + if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0)) { return -TARGET_EFAULT; + } __put_user(tv->tv_sec, &target_tv->tv_sec); __put_user(tv->tv_usec, &target_tv->tv_usec); @@ -1153,6 +1173,48 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr, return 0; } +static inline abi_long target_to_host_timespec(struct timespec *host_ts, + abi_ulong target_addr) +{ + struct target_timespec *target_ts; + + if (!lock_user_struct(VERIFY_READ, target_ts, target_addr, 1)) { + return -TARGET_EFAULT; + } + __get_user(host_ts->tv_sec, &target_ts->tv_sec); + __get_user(host_ts->tv_nsec, &target_ts->tv_nsec); + unlock_user_struct(target_ts, target_addr, 0); + return 0; +} + +static inline abi_long host_to_target_timespec(abi_ulong target_addr, + struct timespec *host_ts) +{ + struct target_timespec *target_ts; + + if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0)) { + return -TARGET_EFAULT; + } + __put_user(host_ts->tv_sec, &target_ts->tv_sec); + __put_user(host_ts->tv_nsec, &target_ts->tv_nsec); + unlock_user_struct(target_ts, target_addr, 1); + return 0; +} + +static inline abi_long host_to_target_timespec64(abi_ulong target_addr, + struct timespec *host_ts) +{ + struct target__kernel_timespec *target_ts; + + if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0)) { + return -TARGET_EFAULT; + } + __put_user(host_ts->tv_sec, &target_ts->tv_sec); + __put_user(host_ts->tv_nsec, &target_ts->tv_nsec); + unlock_user_struct(target_ts, target_addr, 1); + return 0; +} + static inline abi_long copy_from_user_timezone(struct timezone *tz, abi_ulong target_tz_addr) { @@ -4899,6 +4961,54 @@ static abi_long do_ioctl_kdsigaccept(const IOCTLEntry *ie, uint8_t *buf_temp, return get_errno(safe_ioctl(fd, ie->host_cmd, sig)); } +static abi_long do_ioctl_SIOCGSTAMP(const IOCTLEntry *ie, uint8_t *buf_temp, + int fd, int cmd, abi_long arg) +{ + struct timeval tv; + abi_long ret; + + ret = get_errno(safe_ioctl(fd, SIOCGSTAMP, &tv)); + if (is_error(ret)) { + return ret; + } + + if (cmd == (int)TARGET_SIOCGSTAMP_OLD) { + if (copy_to_user_timeval(arg, &tv)) { + return -TARGET_EFAULT; + } + } else { + if (copy_to_user_timeval64(arg, &tv)) { + return -TARGET_EFAULT; + } + } + + return ret; +} + +static abi_long do_ioctl_SIOCGSTAMPNS(const IOCTLEntry *ie, uint8_t *buf_temp, + int fd, int cmd, abi_long arg) +{ + struct timespec ts; + abi_long ret; + + ret = get_errno(safe_ioctl(fd, SIOCGSTAMPNS, &ts)); + if (is_error(ret)) { + return ret; + } + + if (cmd == (int)TARGET_SIOCGSTAMPNS_OLD) { + if (host_to_target_timespec(arg, &ts)) { + return -TARGET_EFAULT; + } + } else{ + if (host_to_target_timespec64(arg, &ts)) { + return -TARGET_EFAULT; + } + } + + return ret; +} + #ifdef TIOCGPTPEER static abi_long do_ioctl_tiocgptpeer(const IOCTLEntry *ie, uint8_t *buf_temp, int fd, int cmd, abi_long arg) @@ -6271,32 +6381,6 @@ static inline abi_long target_ftruncate64(void *cpu_env, abi_long arg1, } #endif -static inline abi_long target_to_host_timespec(struct timespec *host_ts, - abi_ulong target_addr) -{ - struct target_timespec *target_ts; - - if (!lock_user_struct(VERIFY_READ, target_ts, target_addr, 1)) - return -TARGET_EFAULT; - __get_user(host_ts->tv_sec, &target_ts->tv_sec); - __get_user(host_ts->tv_nsec, &target_ts->tv_nsec); - unlock_user_struct(target_ts, target_addr, 0); - return 0; -} - -static inline abi_long host_to_target_timespec(abi_ulong target_addr, - struct timespec *host_ts) -{ - struct target_timespec *target_ts; - - if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0)) - return -TARGET_EFAULT; - __put_user(host_ts->tv_sec, &target_ts->tv_sec); - __put_user(host_ts->tv_nsec, &target_ts->tv_nsec); - unlock_user_struct(target_ts, target_addr, 1); - return 0; -} - static inline abi_long target_to_host_itimerspec(struct itimerspec *host_itspec, abi_ulong target_addr) { diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index fffa89f2564b..06622703008a 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -209,16 +209,34 @@ struct target_linger { abi_int l_linger; /* How long to linger for */ }; +#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) +struct target_timeval { + abi_long tv_sec; + abi_int tv_usec; +}; +#define target__kernel_sock_timeval target_timeval +#else struct target_timeval { abi_long tv_sec; abi_long tv_usec; }; +struct target__kernel_sock_timeval { + abi_llong tv_sec; + abi_llong tv_usec; +}; +#endif + struct target_timespec { abi_long tv_sec; abi_long tv_nsec; }; +struct target__kernel_timespec { + abi_llong tv_sec; + abi_llong tv_nsec; +}; + struct target_timezone { abi_int tz_minuteswest; abi_int tz_dsttime; @@ -749,8 +767,16 @@ struct target_pollfd { #define TARGET_SIOCGPGRP 0x8904 #endif -#define TARGET_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ -#define TARGET_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ +#if defined(TARGET_SH4) +#define TARGET_SIOCGSTAMP_OLD TARGET_IOR('s', 100, struct target_timeval) +#define TARGET_SIOCGSTAMPNS_OLD TARGET_IOR('s', 101, struct target_timespec) +#else +#define TARGET_SIOCGSTAMP_OLD 0x8906 +#define TARGET_SIOCGSTAMPNS_OLD 0x8907 +#endif + +#define TARGET_SIOCGSTAMP_NEW TARGET_IOR(0x89, 0x06, abi_llong[2]) +#define TARGET_SIOCGSTAMPNS_NEW TARGET_IOR(0x89, 0x07, abi_llong[2]) /* Networking ioctls */ #define TARGET_SIOCADDRT 0x890B /* add routing table entry */ diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h index b98a23b0f1b0..4e3698382629 100644 --- a/linux-user/syscall_types.h +++ b/linux-user/syscall_types.h @@ -14,12 +14,6 @@ STRUCT(serial_icounter_struct, STRUCT(sockaddr, TYPE_SHORT, MK_ARRAY(TYPE_CHAR, 14)) -STRUCT(timeval, - MK_ARRAY(TYPE_LONG, 2)) - -STRUCT(timespec, - MK_ARRAY(TYPE_LONG, 2)) - STRUCT(rtentry, TYPE_ULONG, MK_STRUCT(STRUCT_sockaddr), MK_STRUCT(STRUCT_sockaddr), MK_STRUCT(STRUCT_sockaddr), TYPE_SHORT, TYPE_SHORT, TYPE_ULONG, TYPE_PTRVOID, TYPE_SHORT, TYPE_PTRVOID, From patchwork Wed Jul 17 14:54:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1133350 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45pgLM6Vw8z9s3l for ; Thu, 18 Jul 2019 00:55:39 +1000 (AEST) Received: from localhost ([::1]:58106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnlLF-0004It-MK for incoming@patchwork.ozlabs.org; Wed, 17 Jul 2019 10:55:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48126) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnlL6-00047v-De for qemu-devel@nongnu.org; Wed, 17 Jul 2019 10:55:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnlL5-0000mZ-07 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 10:55:28 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:51777) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnlL4-0000ke-Mb for qemu-devel@nongnu.org; Wed, 17 Jul 2019 10:55:26 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MYvTs-1i0ykD2oVs-00UugK; Wed, 17 Jul 2019 16:54:42 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 16:54:18 +0200 Message-Id: <20190717145418.23883-4-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190717145418.23883-1-laurent@vivier.eu> References: <20190717145418.23883-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:A1dtiap+W9ArKGUiGFoPWfgdbKR0TaRnA8I/ucKaEI367OjylTj zDo5OFQF42f54vixZUFZirebTu3GW4L5IS2ZDn82alLEYv6JXpR1TDsx5+6oGx1I9fi8hkI ovSw2mx2fLw+wgyfv/DikXOQcY3WYV3zCespUDO0H1RY5y+zDnMUyJ38QE/XABIYsfHnTYb 8+40zEWSLYpR22NwACLew== X-UI-Out-Filterresults: notjunk:1; V03:K0:0UtVY4qcQPg=:5QAURPSnC8pb4fAsNQLHnU MsyoR6lEnjqylK+b8fOLi4LogLQFYG/EN65E+FPVxLYGT2gfbNVz+/b1Z4Ak60zXXn7rGM7Rs g3FMMHwNJcFEqjoDpV1M5nnHm/TNhFqv2hkSUF20GeG4MFeZjH7X5iGtleMIkywgUUta8pm9s vzc8AaJoEgTH4d9XHhuVtsHxnkquKzx8apfFMp4HkFiE6JJEGoG+w4z5fIaNSJNnapU5dUQph O/up9f5YSlIO3Ow+bsTQX/yDwDSWt017USx9NQLYf3ma03Gwre5twgciDySGeyLwDyq1YxBwz M7vWJKmBm5xTtdPQF1NUbZpRBSuvp6yoBX5BLhqMVbF3XkLslN6U1SljStIYreHUCVAlyZfV1 EAI99AMNST36Cxz7+5NHdY04V/BBb6qlhnMYdRjy1tTTjsvLRwtbZ+TCHxqNpNBLnZzw7gAmD ZoDyQ6Kc6NgpaZdNUs5g6lxCAqrUhBIAf/8z5+5Uo+w7RJ4hDQfHlZ6v5i2erSk5dOB+okGjN 5/xEtMbZLwn3PB2KrKA9mtbBcfUxLjZN9EGdAOVPzmanUCatEY5G8uBAb47wsff3NR1QobMZx hD3jVnbcbPqcLaTtZnk9iRHuqAYDPDXbGRQQ2QDs8LFLwupE7rfUA2AbYp85biicSUOo4Ug/r awSrM/iV7+uDgK5A7sbJnChjCEEiuwj/E+IJ16cHcDZppSeyLPtR8/Li0rMIVV8lWRdzdoIJc +I8OGZlGcTBruNRIyokfHMdzPu5mIq2GJ/aUEdx+hwqnUmmZlgWnS+qBeos= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PULL 3/3] linux-user: check valid address in access_ok() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , =?utf-8?q?R=C3=A9mi_Denis-Courmon?= =?utf-8?q?t?= , Aleksandar Rikalo , Riku Voipio , Laurent Vivier , Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Rémi Denis-Courmont Fix a crash with LTP testsuite and aarch64: tst_test.c:1015: INFO: Timeout per run is 0h 05m 00s qemu-aarch64: .../qemu/accel/tcg/translate-all.c:2522: page_check_range: Assertion `start < ((target_ulong)1 << L1_MAP_ADDR_SPACE_BITS)' failed. qemu:handle_cpu_signal received signal outside vCPU context @ pc=0x60001554 page_check_range() should never be called with address outside the guest address space. This patch adds a guest_addr_valid() check in access_ok() to only call page_check_range() with a valid address. Fixes: f6768aa1b4c6 ("target/arm: fix AArch64 virtual address space size") Signed-off-by: Rémi Denis-Courmont Signed-off-by: Laurent Vivier Message-Id: <20190704084115.24713-1-lvivier@redhat.com> Signed-off-by: Laurent Vivier --- include/exec/cpu_ldst.h | 4 ++++ linux-user/qemu.h | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 9de8c933031b..9151fdb042c4 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -62,7 +62,11 @@ typedef uint64_t abi_ptr; /* All direct uses of g2h and h2g need to go away for usermode softmmu. */ #define g2h(x) ((void *)((unsigned long)(abi_ptr)(x) + guest_base)) +#if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS +#define guest_addr_valid(x) (1) +#else #define guest_addr_valid(x) ((x) <= GUEST_ADDR_MAX) +#endif #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) static inline int guest_range_valid(unsigned long start, unsigned long len) diff --git a/linux-user/qemu.h b/linux-user/qemu.h index fab287b7ec50..4258e4162d26 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -456,7 +456,9 @@ extern unsigned long guest_stack_size; static inline int access_ok(int type, abi_ulong addr, abi_ulong size) { - return page_check_range((target_ulong)addr, size, + return guest_addr_valid(addr) && + (size == 0 || guest_addr_valid(addr + size - 1)) && + page_check_range((target_ulong)addr, size, (type == VERIFY_READ) ? PAGE_READ : (PAGE_READ | PAGE_WRITE)) == 0; }