From patchwork Tue Jan 8 18:49:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1022092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Exn5MZHD"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43Z1X018XYz9sD9 for ; Wed, 9 Jan 2019 05:49:34 +1100 (AEDT) Received: from localhost ([127.0.0.1]:43050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggwRM-0001aE-Um for incoming@patchwork.ozlabs.org; Tue, 08 Jan 2019 13:49:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggwR0-0001ZG-E1 for qemu-devel@nongnu.org; Tue, 08 Jan 2019 13:49:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggwQz-00051z-Dk for qemu-devel@nongnu.org; Tue, 08 Jan 2019 13:49:06 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:52331) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggwQz-0004wF-3I for qemu-devel@nongnu.org; Tue, 08 Jan 2019 13:49:05 -0500 Received: by mail-wm1-x344.google.com with SMTP id m1so5168344wml.2 for ; Tue, 08 Jan 2019 10:49:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CtEIIHqNBicjXIs8+brZC5KLIT1PsOHz9wHfD6hmLho=; b=Exn5MZHD0kVyM4Q46oUUW5pAJjweWnlFJyJ9bYm/jDvv0u7qg2wQrMs2OjS+CRDuby tJcapdjfMmvXK2mVKPV6slagWXYDCKjHPlDJsicokjso9InT5Hg/XRdGQY2VqHhFYsiH SjrWBDD/04RKXuJn4tWsxXLezs3p3KQFeNc6c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CtEIIHqNBicjXIs8+brZC5KLIT1PsOHz9wHfD6hmLho=; b=p23oDCEuijj7VOwTjLZfMOLWbfrDOCW8yWoFhXh0/pz5FMsMY1vE6BBpFTsv9Ab8pd JLHqyD8Qtmlc6Ml9tbNrMSm09Yd52WSVXkRssHcfEoMwr2c1g1cB+/t8bPkE1TyeJVV9 SC4YoD6X9lRqKOyinipMWZn0760GRyrtp3KYqouE046s4dvukCL4gyrT+t06eQHbEGDP ucpw8vTQDGJN9uHsRi8MTpJ83S+GtSJqZ2EAlkQCUPPq+2LJvrExZfnRIT9biVIVsleq bbPDLayqj9H+7dDfUhepJ7Zt3ePEXJkg04MxHQcZGu1pfvlu8sGEp56g92c2ZbmQ69dZ uOIA== X-Gm-Message-State: AJcUukdJ5MR8OL1Gm2vpGR2mSfw5xhNEFFhw+MCflt9MHkQKe36j0e6w nELUQAnYUvg6EPZ5zjHmjqyhdS0dcWPxuw== X-Google-Smtp-Source: ALg8bN6OM8YtMvhrIZPgj5idjviOdI8hteFfa2Pj8c3bhV2zt1Lkh0lJvaEUsJy/HTTKNnOtvoqV0g== X-Received: by 2002:a7b:cf30:: with SMTP id m16mr2802661wmg.22.1546973342607; Tue, 08 Jan 2019 10:49:02 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id h17sm53938829wrt.59.2019.01.08.10.49.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Jan 2019 10:49:01 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 8 Jan 2019 18:49:00 +0000 Message-Id: <20190108184900.9654-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH] linux-user: make pwrite64/pread64(fd, NULL, 0, offset) return 0 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Linux returns success if pwrite64() or pread64() are called with a zero length NULL buffer, but QEMU was returning -TARGET_EFAULT. This is the same bug that we fixed in commit 58cfa6c2e6eb51b23cc9 for the write syscall, and long before that in 38d840e6790c29f59 for the read syscall. Fixes: https://bugs.launchpad.net/qemu/+bug/1810433 Signed-off-by: Peter Maydell Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé --- I chose to fix this by setting p to NULL and falling through to the normal-case codepath rather than having a call to pread/pwrite in the special-case if like 58cfa6c2e6eb5, because here the normal-case is a bit more complicated as it has the target_offset64() call in it. 38d840e6790c29f59 has "just return 0" for the NULL buffer case, but we can't do that here as that would not get the "negative offset should return -EINVAL" case write. --- linux-user/syscall.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 280137da8c2..b13a170e52e 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9677,8 +9677,15 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, arg4 = arg5; arg5 = arg6; } - if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0))) - return -TARGET_EFAULT; + if (arg2 == 0 && arg3 == 0) { + /* Special-case NULL buffer and zero length, which should succeed */ + p = 0; + } else { + p = lock_user(VERIFY_WRITE, arg2, arg3, 0); + if (!p) { + return -TARGET_EFAULT; + } + } ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5))); unlock_user(p, arg2, ret); return ret; @@ -9687,8 +9694,15 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, arg4 = arg5; arg5 = arg6; } - if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1))) - return -TARGET_EFAULT; + if (arg2 == 0 && arg3 == 0) { + /* Special-case NULL buffer and zero length, which should succeed */ + p = 0; + } else { + p = lock_user(VERIFY_READ, arg2, arg3, 1); + if (!p) { + return -TARGET_EFAULT; + } + } ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5))); unlock_user(p, arg2, 0); return ret;