From patchwork Fri Aug 22 13:24:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 35808 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 404A2205D8 for ; Fri, 22 Aug 2014 13:31:59 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id b6sf35093000yha.9 for ; Fri, 22 Aug 2014 06:31:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=g6f69iI0kwZB9pNwn2Oieo0xEiH3h3m3Ue1GW6RHdcs=; b=AQyemYxxO8x3gH7rdThyQo+bsGzjQwdJz6RGjGxbA39IRjcgOmfoCtpExsGe3xb7kV gk1MMKzDmZZclnqiqcAs4nq8aIgzUbjc5k9TCZHerKJ6g8MFdvvNFep0/vgLctCZhwRf wOCIMFBJgSyeOq5zMLz1M188/eHvOM5MaunhVOWbsmGYgGH5sstTv2U+f1MJ53ozcunq Oa5z7wimEL6GzoiIEflzPv0h4QnxrNJCg5D9ma25I7dza2oxedrpD/aVGJgv2GDMn4FZ P10gGunDQ98LhnahIcgQR8pG5yh0f8NxyDCVkNLiip3GVpNLQBC+KOnRlw8FKUK29txN wZtA== X-Gm-Message-State: ALoCoQmYmnzXI2bOFqxEckuyLJpTFvh/DI0UY58BqYase8/qAnuUgZLuH6HvQ1B0pwYubObjZPpp X-Received: by 10.236.23.230 with SMTP id v66mr8566636yhv.53.1408714319008; Fri, 22 Aug 2014 06:31:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.102 with SMTP id a93ls1117454qge.15.gmail; Fri, 22 Aug 2014 06:31:58 -0700 (PDT) X-Received: by 10.53.9.133 with SMTP id ds5mr73542vdd.66.1408714318929; Fri, 22 Aug 2014 06:31:58 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id e4si13562070vdw.49.2014.08.22.06.31.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Aug 2014 06:31:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ik5so12177121vcb.20 for ; Fri, 22 Aug 2014 06:31:58 -0700 (PDT) X-Received: by 10.221.68.66 with SMTP id xx2mr4050577vcb.1.1408714318835; Fri, 22 Aug 2014 06:31:58 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp17120vcb; Fri, 22 Aug 2014 06:31:58 -0700 (PDT) X-Received: by 10.140.47.129 with SMTP id m1mr7278974qga.95.1408714317785; Fri, 22 Aug 2014 06:31:57 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 4si42239227qaa.86.2014.08.22.06.31.57 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 22 Aug 2014 06:31:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:37127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKowf-0006ID-Bp for patch@linaro.org; Fri, 22 Aug 2014 09:31:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKopo-0006We-1h for qemu-devel@nongnu.org; Fri, 22 Aug 2014 09:24:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKopf-0002BF-VM for qemu-devel@nongnu.org; Fri, 22 Aug 2014 09:24:51 -0400 Received: from afflict.kos.to ([92.243.29.197]:39301) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKopf-0002Al-KW for qemu-devel@nongnu.org; Fri, 22 Aug 2014 09:24:43 -0400 Received: from afflict.kos.to (afflict [92.243.29.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 82D2C264DA; Fri, 22 Aug 2014 15:24:42 +0200 (CEST) From: riku.voipio@linaro.org To: Peter Maydell , qemu-devel@nongnu.org Date: Fri, 22 Aug 2014 16:24:22 +0300 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 92.243.29.197 Subject: [Qemu-devel] [PULL v3 04/22] linux-user: Fix conversion of sigevent argument to timer_create 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Maydell There were a number of bugs in the conversion of the sigevent argument to timer_create from target to host format: * signal number not converted from target to host * thread ID not copied across * sigev_value not copied across * we never unlocked the struct when we were done Between them, these problems meant that SIGEV_THREAD_ID timers (and the glibc-implemented SIGEV_THREAD timers which depend on them) didn't work. Fix these problems and clean up the code a little by pulling the struct conversion out into its own function, in line with how we convert various other structs. This allows the test program in bug LP:1042388 to run. Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/syscall.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index dd77673..fccf9f0 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4912,6 +4912,32 @@ static inline abi_long host_to_target_itimerspec(abi_ulong target_addr, return 0; } +static inline abi_long target_to_host_sigevent(struct sigevent *host_sevp, + abi_ulong target_addr) +{ + struct target_sigevent *target_sevp; + + if (!lock_user_struct(VERIFY_READ, target_sevp, target_addr, 1)) { + return -TARGET_EFAULT; + } + + /* This union is awkward on 64 bit systems because it has a 32 bit + * integer and a pointer in it; we follow the conversion approach + * used for handling sigval types in signal.c so the guest should get + * the correct value back even if we did a 64 bit byteswap and it's + * using the 32 bit integer. + */ + host_sevp->sigev_value.sival_ptr = + (void *)(uintptr_t)tswapal(target_sevp->sigev_value.sival_ptr); + host_sevp->sigev_signo = + target_to_host_signal(tswap32(target_sevp->sigev_signo)); + host_sevp->sigev_notify = tswap32(target_sevp->sigev_notify); + host_sevp->_sigev_un._tid = tswap32(target_sevp->_sigev_un._tid); + + unlock_user_struct(target_sevp, target_addr, 1); + return 0; +} + #if defined(TARGET_NR_stat64) || defined(TARGET_NR_newfstatat) static inline abi_long host_to_target_stat64(void *cpu_env, abi_ulong target_addr, @@ -9403,7 +9429,6 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, /* args: clockid_t clockid, struct sigevent *sevp, timer_t *timerid */ struct sigevent host_sevp = { {0}, }, *phost_sevp = NULL; - struct target_sigevent *ptarget_sevp; struct target_timer_t *ptarget_timer; int clkid = arg1; @@ -9415,14 +9440,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, timer_t *phtimer = g_posix_timers + timer_index; if (arg2) { - if (!lock_user_struct(VERIFY_READ, ptarget_sevp, arg2, 1)) { - goto efault; - } - - host_sevp.sigev_signo = tswap32(ptarget_sevp->sigev_signo); - host_sevp.sigev_notify = tswap32(ptarget_sevp->sigev_notify); - phost_sevp = &host_sevp; + ret = target_to_host_sigevent(phost_sevp, arg2); + if (ret != 0) { + break; + } } ret = get_errno(timer_create(clkid, phost_sevp, phtimer));