david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-user: Use safe_syscall wrapper for semop

Browse Source 
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 <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2016-06-06 19:58:12 +01:00 committed by Riku Voipio
parent 227f02143f
commit ffb7ee796a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
linux-user/syscall.c
View File

@ -732,6 +732,8 @@ safe_syscall4(int, msgsnd, int, msgid, const void *, msgp, size_t, sz,
int, flags) int, flags)
safe_syscall5(int, msgrcv, int, msgid, void *, msgp, size_t, sz, safe_syscall5(int, msgrcv, int, msgid, void *, msgp, size_t, sz,
long, msgtype, int, flags) long, msgtype, int, flags)
safe_syscall4(int, semtimedop, int, semid, struct sembuf *, tsops,
unsigned, nsops, const struct timespec *, timeout)
#else #else
/* This host kernel architecture uses a single ipc syscall; fake up /* This host kernel architecture uses a single ipc syscall; fake up
* wrappers for the sub-operations to hide this implementation detail. * 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 * sys/ipc.h ones. So we just define them here, and rely on them being
* the same for all host architectures. * the same for all host architectures.
*/ */
#define Q_SEMTIMEDOP 4
#define Q_MSGSND 11 #define Q_MSGSND 11
#define Q_MSGRCV 12 #define Q_MSGRCV 12
#define Q_IPCCALL(VERSION, OP) ((VERSION) << 16 | (OP)) #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); 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 #endif
#if defined(TARGET_NR_mq_open) && defined(__NR_mq_open) #if defined(TARGET_NR_mq_open) && defined(__NR_mq_open)
safe_syscall5(int, mq_timedsend, int, mqdes, const char *, msg_ptr, 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)) if (target_to_host_sembuf(sops, ptr, nsops))
return -TARGET_EFAULT; return -TARGET_EFAULT;
return get_errno(semop(semid, sops, nsops)); return get_errno(safe_semtimedop(semid, sops, nsops, NULL));
} }
struct target_msqid_ds struct target_msqid_ds