From patchwork Sun Jun 29 12:14:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 32675 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8B67823577 for ; Sun, 29 Jun 2014 12:22:05 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id tr6sf44593030ieb.11 for ; Sun, 29 Jun 2014 05:22:05 -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:cc: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=aLdiDGIRGnXQRX17SrlQmS1X9M1lE2nVCqVyYiyPdag=; b=cJ9zV5oz1nX4rqVJOcDqQ/fwadLnXp3swZpH9YtHo8AVNJhDe0wmxvkQZwDPM/fYvG jgi0NIqDcOU4shNEIw8kjiZi/G8j2sRSGt3tBGBjyOjX32Rr23l30x8SR705bTKPVD6Y E78c8bIzEi5zqbBf1HtIvbssBtrWW/tn77rPnBGtwg+UIBb6P9ggIj8KQPocOvmgT12k GW2DKrBEZh4D4ZyJBlknv+IAals/q1h9GMcwVOyuniqbukzdD5qGCwTgZtmEgfWPBYy/ b+4nGqvJsgVrFR+w+IFDCe5AVQFr8NFPDh6xtUPHM9vwB8ND2u4QngYnasKWoNMVY9kq bQhQ== X-Gm-Message-State: ALoCoQnLj/9XFM8UWcZOzFWuvnB2GE00fEtT/mUONdwxJuwL+c4wbmbteV7cvDNltB/JP7rzy1fQ X-Received: by 10.50.148.1 with SMTP id to1mr12725784igb.0.1404044524918; Sun, 29 Jun 2014 05:22:04 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.114 with SMTP id o105ls1249461qgd.30.gmail; Sun, 29 Jun 2014 05:22:04 -0700 (PDT) X-Received: by 10.58.29.164 with SMTP id l4mr31582717veh.8.1404044524744; Sun, 29 Jun 2014 05:22:04 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id a10si3538948vdt.52.2014.06.29.05.22.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 29 Jun 2014 05:22:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hy10so6512964vcb.15 for ; Sun, 29 Jun 2014 05:22:04 -0700 (PDT) X-Received: by 10.58.12.73 with SMTP id w9mr32789762veb.13.1404044524645; Sun, 29 Jun 2014 05:22:04 -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.37.5 with SMTP id tc5csp72592vcb; Sun, 29 Jun 2014 05:22:04 -0700 (PDT) X-Received: by 10.140.91.164 with SMTP id z33mr9971461qgd.65.1404044524145; Sun, 29 Jun 2014 05:22:04 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m19si21013896qab.4.2014.06.29.05.22.04 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 29 Jun 2014 05:22:04 -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]:57565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1E7P-00086H-Nv for patch@linaro.org; Sun, 29 Jun 2014 08:22:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1E0g-0004AC-Pw for qemu-devel@nongnu.org; Sun, 29 Jun 2014 08:15:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1E0c-0000lL-Er for qemu-devel@nongnu.org; Sun, 29 Jun 2014 08:15:06 -0400 Received: from afflict.kos.to ([92.243.29.197]:54995) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1E0Y-0000cA-1v for qemu-devel@nongnu.org; Sun, 29 Jun 2014 08:15:02 -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 560D22658A; Sun, 29 Jun 2014 14:14:56 +0200 (CEST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Sun, 29 Jun 2014 15:14:51 +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 Cc: Peter Maydell , Anthony Liguori , Paul Burton Subject: [Qemu-devel] [PULL v2 11/13] linux-user: allow NULL tv argument for settimeofday 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.170 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: Paul Burton The tv argument to the settimeofday syscall is allowed to be NULL, if the program only wishes to provide the timezone. QEMU previously returned -EFAULT when tv was NULL. Instead, execute the syscall & provide NULL to the kernel as the target program expected. Signed-off-by: Paul Burton Signed-off-by: Riku Voipio --- linux-user/syscall.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 0ce1a4e..8e2762b 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6401,11 +6401,15 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, break; case TARGET_NR_settimeofday: { - struct timeval tv; + struct timeval tv, *ptv = NULL; struct timezone tz, *ptz = NULL; - if (copy_from_user_timeval(&tv, arg1)) - goto efault; + if (arg1) { + if (copy_from_user_timeval(&tv, arg1)) { + goto efault; + } + ptv = &tv; + } if (arg2) { if (copy_from_user_timezone(&tz, arg2)) { @@ -6414,7 +6418,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ptz = &tz; } - ret = get_errno(settimeofday(&tv, ptz)); + ret = get_errno(settimeofday(ptv, ptz)); } break; #if defined(TARGET_NR_select)