From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAdZn-0004f3-JE for qemu-devel@nongnu.org; Wed, 08 Jun 2016 09:31:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAdZi-0005sS-7F for qemu-devel@nongnu.org; Wed, 08 Jun 2016 09:31:19 -0400 Received: from mail-lf0-x22d.google.com ([2a00:1450:4010:c07::22d]:36354) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAdZh-0005sG-VN for qemu-devel@nongnu.org; Wed, 08 Jun 2016 09:31:14 -0400 Received: by mail-lf0-x22d.google.com with SMTP id j5so5845958lfb.3 for ; Wed, 08 Jun 2016 06:31:13 -0700 (PDT) From: riku.voipio@linaro.org Date: Wed, 8 Jun 2016 16:30:19 +0300 Message-Id: In-Reply-To: References: Subject: [Qemu-devel] [PULL 38/44] linux-user: Use safe_syscall wrapper for semop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell From: Peter Maydell Use the safe_syscall wrapper for the semop syscall or IPC operation. (We implement via the semtimedop syscall to make it easier to implement the guest semtimedop syscall later.) Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/syscall.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a193849..3ccb367 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -732,6 +732,8 @@ safe_syscall4(int, msgsnd, int, msgid, const void *, msgp, size_t, sz, int, flags) safe_syscall5(int, msgrcv, int, msgid, void *, msgp, size_t, sz, long, msgtype, int, flags) +safe_syscall4(int, semtimedop, int, semid, struct sembuf *, tsops, + unsigned, nsops, const struct timespec *, timeout) #else /* This host kernel architecture uses a single ipc syscall; fake up * wrappers for the sub-operations to hide this implementation detail. @@ -740,6 +742,7 @@ safe_syscall5(int, msgrcv, int, msgid, void *, msgp, size_t, sz, * sys/ipc.h ones. So we just define them here, and rely on them being * the same for all host architectures. */ +#define Q_SEMTIMEDOP 4 #define Q_MSGSND 11 #define Q_MSGRCV 12 #define Q_IPCCALL(VERSION, OP) ((VERSION) << 16 | (OP)) @@ -754,6 +757,12 @@ static int safe_msgrcv(int msgid, void *msgp, size_t sz, long type, int flags) { return safe_ipc(Q_IPCCALL(1, Q_MSGRCV), msgid, sz, flags, msgp, type); } +static int safe_semtimedop(int semid, struct sembuf *tsops, unsigned nsops, + const struct timespec *timeout) +{ + return safe_ipc(Q_IPCCALL(0, Q_SEMTIMEDOP), semid, nsops, 0, tsops, + (long)timeout); +} #endif #if defined(TARGET_NR_mq_open) && defined(__NR_mq_open) safe_syscall5(int, mq_timedsend, int, mqdes, const char *, msg_ptr, @@ -3680,7 +3689,7 @@ static inline abi_long do_semop(int semid, abi_long ptr, unsigned nsops) if (target_to_host_sembuf(sops, ptr, nsops)) return -TARGET_EFAULT; - return get_errno(semop(semid, sops, nsops)); + return get_errno(safe_semtimedop(semid, sops, nsops, NULL)); } struct target_msqid_ds -- 2.1.4