From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9zjG-00006q-Na for qemu-devel@nongnu.org; Mon, 06 Jun 2016 14:58:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9zjE-0003lv-Pn for qemu-devel@nongnu.org; Mon, 06 Jun 2016 14:58:25 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:57538) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9zjE-0003lp-Id for qemu-devel@nongnu.org; Mon, 06 Jun 2016 14:58:24 -0400 From: Peter Maydell Date: Mon, 6 Jun 2016 19:58:07 +0100 Message-Id: <1465239499-5048-7-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1465239499-5048-1-git-send-email-peter.maydell@linaro.org> References: <1465239499-5048-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 06/18] linux-user: Use safe_syscall wrapper for flock List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org, Riku Voipio , Laurent Vivier Use the safe_syscall wrapper for the flock syscall. Signed-off-by: Peter Maydell --- linux-user/syscall.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index cdc7428..559b4f7 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -709,6 +709,7 @@ safe_syscall6(ssize_t, recvfrom, int, fd, void *, buf, size_t, len, int, flags, struct sockaddr *, addr, socklen_t *, addrlen) safe_syscall3(ssize_t, sendmsg, int, fd, const struct msghdr *, msg, int, flags) safe_syscall3(ssize_t, recvmsg, int, fd, struct msghdr *, msg, int, flags) +safe_syscall2(int, flock, int, fd, int, operation) #ifdef __NR_msgsnd safe_syscall4(int, msgsnd, int, msgid, const void *, msgp, size_t, sz, int, flags) @@ -8384,7 +8385,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, case TARGET_NR_flock: /* NOTE: the flock constant seems to be the same for every Linux platform */ - ret = get_errno(flock(arg1, arg2)); + ret = get_errno(safe_flock(arg1, arg2)); break; case TARGET_NR_readv: { -- 1.9.1