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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E294CC433F5 for ; Mon, 18 Oct 2021 19:04:04 +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 9498061283 for ; Mon, 18 Oct 2021 19:04:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9498061283 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:52058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcXvV-0002Sg-SW for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 15:04:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcXtG-0007x3-7e for qemu-devel@nongnu.org; Mon, 18 Oct 2021 15:01:42 -0400 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]:38801) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcXtE-0001Wi-1i for qemu-devel@nongnu.org; Mon, 18 Oct 2021 15:01:41 -0400 Received: by mail-io1-xd32.google.com with SMTP id d125so17524789iof.5 for ; Mon, 18 Oct 2021 12:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RLjwrAOhbaeXdkBQmG2ODKBch/v6AHtkj1VQlFfA1Pk=; b=cx1zDtiOPrsgzkblYxrC/N+IhoifRU4rG+5Av6shtwIPpradxWRZtEnjJi2Ob1W1RK DS2mk8IYC8GcNgys9xUtrTB+HUr/aGra//Tp6Gj/lfHt+0HHAJybtFMAHaSKUbM0qNiC TXQa1iuWzeoLmwNsQxnkEqSBUrucvAOSDA4ciR9KJLHSmzAKuX9E9mt2MhbUejW3dPh/ y378c0Mbygfc5KAUshyy9eEdYmXXtQ1M8SzR4MthREE0wXUH/ySf47VhiXscNNGjFgI8 b9z0HETG5KcNCpM6CQdZYuukxjBVZbt2Ki0kVXNbMauRjVxdAM7NBcEOhZRJivFdK3E3 33JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RLjwrAOhbaeXdkBQmG2ODKBch/v6AHtkj1VQlFfA1Pk=; b=sIMPSOAPQgd1wyMhaCuU1oqNDfNYrdgy2zaXBb78a38PFzuO3aRLl+aLDh2HL213NV ufBJSMzZapEFsaxEhi+z42B/ddQkPkvoYPCsO/EGGHoZxiRtAlSE1aM9X/aUyE8NwnKe li6gKejqwjaj+x4U4ryQ+XLQi5T/Vi4auwP4PWgBI1qT4eljaVurc41BMrP5DfrPBOK1 faQ1OHRih9oPKiaqXSkDYYdp2EpFH6ePH2krylTjZ47ksTeT5R9KWOn4BwXRBMd18FVh 0zuJOYUwE8Szw/Ai3rK2PBMb7V4nBLuavrVzW2vdSPx/0Tx0psxwTru4pjC16aQbe8yj LEcA== X-Gm-Message-State: AOAM53298GvbwKLS4OcQiAv2M3h2AoPjC9qlojctGC/hTz7z4OPHVUZm dPIaQ/iXEa2kuBgBdCjG758J/UcpJVaPjw== X-Google-Smtp-Source: ABdhPJydhlJ3gZoNyytNS/Hv/aUcZ2d0IegbVf7CKwJjHr+uXpEw9tZsOAPVS+OsK7PQkUBi9DMsPQ== X-Received: by 2002:a6b:2c95:: with SMTP id s143mr15354420ios.36.1634583698253; Mon, 18 Oct 2021 12:01:38 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a8sm6945151ilh.5.2021.10.18.12.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 12:01:37 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL v2 04/23] bsd-user/mmap.c: mmap return ENOMEM on overflow Date: Mon, 18 Oct 2021 13:00:56 -0600 Message-Id: <20211018190115.5365-5-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018190115.5365-1-imp@bsdimp.com> References: <20211018190115.5365-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2607:f8b0:4864:20::d32; envelope-from=imp@bsdimp.com; helo=mail-io1-xd32.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" mmap should return ENOMEM on len overflow rather than EINVAL. Return EINVAL when len == 0 and ENOMEM when the rounded to a page length is 0. Found by make check-tcg. Signed-off-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kyle Evans --- bsd-user/mmap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 6f33aec58b..f0be3b12cf 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -455,11 +455,18 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, goto fail; } - len = TARGET_PAGE_ALIGN(len); if (len == 0) { errno = EINVAL; goto fail; } + + /* Check for overflows */ + len = TARGET_PAGE_ALIGN(len); + if (len == 0) { + errno = ENOMEM; + goto fail; + } + real_start = start & qemu_host_page_mask; host_offset = offset & qemu_host_page_mask; -- 2.32.0