From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2915C433E0 for ; Thu, 11 Feb 2021 13:34:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2385264E87 for ; Thu, 11 Feb 2021 13:34:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2385264E87 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAC7J-00084D-4v for qemu-devel@archiver.kernel.org; Thu, 11 Feb 2021 08:34:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lABZ6-0008Gk-JR for qemu-devel@nongnu.org; Thu, 11 Feb 2021 07:59:24 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36758) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lABZ3-0008V0-Mt for qemu-devel@nongnu.org; Thu, 11 Feb 2021 07:59:24 -0500 Received: by mail-wr1-x435.google.com with SMTP id u14so4118035wri.3 for ; Thu, 11 Feb 2021 04:59:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8hJfKWlZ7fO6Xix7TA92xQ2IC7VHBbIlzPjoCjc38sI=; b=zJ345KYZOFODnBQMFFox1pGLxWvXURd7EUOYw2+wGYCDz44qdjYzTcItuuqvAnrG8K DU8ssq4NtV/NSLRM9vMRUaGSpHgajqI87jljs8lFZlG1/LypLagsuMwhzfceKJLNhUVl LfMyh9ZWWPg4mLZR8FUCnZSA1/xJ/3EYb3vHnd0nX67bzZRFGmlvthbCeba8RJvB7dd6 cm7XMOhps1DZ0LzL/Oc6ec3UqAQsqL0joVsBxyV4++KNSEPvwRL4Yi9NH+rCQgDy8/2H ZugSmZmqNQIMcUFyD9N0RImbyANrjOj71AAEDMvq7M5mv0HGgI0b4iOePQx+3nv192Xp 3h8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8hJfKWlZ7fO6Xix7TA92xQ2IC7VHBbIlzPjoCjc38sI=; b=QnX2rSOanqLq/ETyrl2bZoW3/9afWyXwB2e9coZkpkLKfhxg57ki6hKeAhGEUiY4OQ tXixWngf7jo6a8Z+KgyJt1eodMoP8D2zfwChhnHAMfELHeUyYM6SZSdKbcUzRfCirgcv mUGYbXfhGMkxW//fVBMJrTh+yJFzG8YQKfQPDVxZ/ITiUm1+OOwq7jpmDoSZYIWNnN9b Lb12wdTqZJHsXlyW4ipzBPTv6DN3r9+v4h9lOcYfbTwZz/hr4QI7ZvjZ9p1i1tZzDu/y nXhWv8uK7sgRZ2V9P/G8uuitjudjxTkKsoZ00UYzwHYphG3kCa30BUDACYMjC1aiQz2E LM3w== X-Gm-Message-State: AOAM530F/xy9SxyupFTKmeNZnlKPL4HK/F9ioZ3KUH9VNOM9ga1CxIap vrAICvyT9AITYqNjFTHSCpNjGlwVlu+IdQ== X-Google-Smtp-Source: ABdhPJxAdriuBt3lpvTYkW3jhopbF0VnHYwLGoW/Nwfj6rK3HaqsqAjrjmXm5Q3jR/hRXkYMJEB21g== X-Received: by 2002:a5d:4708:: with SMTP id y8mr5491223wrq.402.1613048360474; Thu, 11 Feb 2021 04:59:20 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id g15sm4955716wrx.1.2021.02.11.04.59.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Feb 2021 04:59:20 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 23/45] linux-user: Use guest_range_valid in access_ok Date: Thu, 11 Feb 2021 12:58:38 +0000 Message-Id: <20210211125900.22777-24-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210211125900.22777-1-peter.maydell@linaro.org> References: <20210211125900.22777-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson We're currently open-coding the range check in access_ok; use guest_range_valid when size != 0. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20210210000223.884088-15-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- linux-user/qemu.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 9fbc5edc4bd..ba122a79039 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -493,12 +493,9 @@ extern unsigned long guest_stack_size; static inline bool access_ok(int type, abi_ulong addr, abi_ulong size) { - if (!guest_addr_valid(addr)) { - return false; - } - if (size != 0 && - (addr + size - 1 < addr || - !guest_addr_valid(addr + size - 1))) { + if (size == 0 + ? !guest_addr_valid(addr) + : !guest_range_valid(addr, size)) { return false; } return page_check_range((target_ulong)addr, size, type) == 0; -- 2.20.1