From patchwork Mon Jun 27 16:44:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 102235 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DDC1DB6F65 for ; Tue, 28 Jun 2011 03:45:56 +1000 (EST) Received: from localhost ([::1]:37145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbFsc-0008MI-Tj for incoming@patchwork.ozlabs.org; Mon, 27 Jun 2011 13:45:51 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbEvp-0001fB-JU for qemu-devel@nongnu.org; Mon, 27 Jun 2011 12:45:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QbEvm-0002Zz-KH for qemu-devel@nongnu.org; Mon, 27 Jun 2011 12:45:05 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:57735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbEvm-0002Y8-0u for qemu-devel@nongnu.org; Mon, 27 Jun 2011 12:45:02 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QbEvc-0006wB-47; Mon, 27 Jun 2011 17:44:52 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 27 Jun 2011 17:44:52 +0100 Message-Id: <1309193092-26640-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1309193092-26640-1-git-send-email-peter.maydell@linaro.org> References: <1309193092-26640-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Riku Voipio , patches@linaro.org Subject: [Qemu-devel] [PATCH 2/2] linux-user: Implement prlimit64 syscall X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Implement the prlimit64 syscall. Signed-off-by: Peter Maydell --- linux-user/syscall.c | 43 +++++++++++++++++++++++++++++++++++++++++++ linux-user/syscall_defs.h | 5 +++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5cb27c7..2ec1c2b 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -550,6 +550,21 @@ _syscall5(int, sys_ppoll, struct pollfd *, fds, nfds_t, nfds, size_t, sigsetsize) #endif +#if defined(TARGET_NR_prlimit64) +#ifndef __NR_prlimit64 +# define __NR_prlimit64 -1 +#endif +#define __NR_sys_prlimit64 __NR_prlimit64 +/* The glibc rlimit structure may not be that used by the underlying syscall */ +struct host_rlimit64 { + uint64_t rlim_cur; + uint64_t rlim_max; +}; +_syscall4(int, sys_prlimit64, pid_t, pid, int, resource, + const struct host_rlimit64 *, new_limit, + struct host_rlimit64 *, old_limit) +#endif + extern int personality(int); extern int flock(int, int); extern int setfsuid(int); @@ -7840,6 +7855,34 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } #endif #endif +#ifdef TARGET_NR_prlimit64 + case TARGET_NR_prlimit64: + { + /* args: pid, resource number, ptr to new rlimit, ptr to old rlimit */ + struct target_rlimit64 *target_rnew, *target_rold; + struct host_rlimit64 rnew, rold, *rnewp = 0; + if (arg3) { + if (!lock_user_struct(VERIFY_READ, target_rnew, arg3, 1)) { + goto efault; + } + rnew.rlim_cur = tswap64(target_rnew->rlim_cur); + rnew.rlim_max = tswap64(target_rnew->rlim_max); + unlock_user_struct(target_rnew, arg3, 0); + rnewp = &rnew; + } + + ret = get_errno(sys_prlimit64(arg1, arg2, rnewp, arg4 ? &rold : 0)); + if (!is_error(ret) && arg4) { + if (!lock_user_struct(VERIFY_WRITE, target_rold, arg4, 1)) { + goto efault; + } + target_rold->rlim_cur = tswap64(rold.rlim_cur); + target_rold->rlim_max = tswap64(rold.rlim_max); + unlock_user_struct(target_rold, arg4, 1); + } + break; + } +#endif default: unimplemented: gemu_log("qemu: Unsupported syscall: %d\n", num); diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 04c268d..e2700eb 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2280,3 +2280,8 @@ struct target_epoll_event { target_epoll_data_t data; }; #endif + +struct target_rlimit64 { + uint64_t rlim_cur; + uint64_t rlim_max; +};