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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 294E1C27C53 for ; Wed, 12 Jun 2024 13:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mVdDozQhgLCHWTGkIS279cpqPxFfjKVFZDQpKU4sKrQ=; b=2at9MKbz1nGAkk09F5nqFr8aQB uaYKFvwJkgwXpH+CfcZ9GCVl/JwIhF6YEbXoWqzZOk+2UnjnEi1SjUHUJfgsiT7lGSGu60LnPQJwp HUKVz2dL9n4uw6AWsuuVX1Y7vjnYMyY5VghZZg9mckCs+iUS3LfqtOwg99lg/7svRX14cgIjEwDzV Z4Epj3Gmm1xxpooIw5H/gaYtxgg7NIwRNfXGqG4B5k+Dyx5sNiCe3ynjV9WKVfg1JDLOy/JLTY1ty 0veag707Ak0i8ZCfINLVMtqyhZIFpjx8jkIP1AYDQcW43ZfSDameDLQNcPuWNYlbrX6T7Zj8qQLCP QpsMj+DA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHOL8-0000000CnXJ-0spA; Wed, 12 Jun 2024 13:48:38 +0000 Received: from s3.sipsolutions.net ([2a01:4f8:242:246e::2] helo=sipsolutions.net) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHOL5-0000000CnUW-059y for linux-um@lists.infradead.org; Wed, 12 Jun 2024 13:48:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sipsolutions.net; s=mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Content-Type:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-To: Resent-Cc:Resent-Message-ID; bh=mVdDozQhgLCHWTGkIS279cpqPxFfjKVFZDQpKU4sKrQ=; t=1718200114; x=1719409714; b=w449oHxhaVwr+huu49TpYbz9WIniDD2K47Qvdu3QXwNIM9D KNGarNA23qF7/wErpkKaOGG1w3gkCBWNtkDPMX+nFvd/XnbOt96YgMALp57VphAt/b21thGkbQMhO LJxyTsdgYzwDgAu/17C6cCUsvb1SgW6GCV7LmcQILQY7055bpA6yD9XGMKyxfWJ0zvQyzhwQPq1ep uWRZCfB44RDbYgveHopuizA7nt7VvB3dgXF4fKT2ztb4UwcKcP6F8g8BE8txrYnYvzWQEKkfeu7Vq w2hBwWuSBPEB2sVb4QIa61JZGxK3e8C2t/lWo3rgbOguagPz9lwGnIdEM+VFh3hg==; Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.97) (envelope-from ) id 1sHOL2-0000000ALhN-2CBx; Wed, 12 Jun 2024 15:48:33 +0200 From: benjamin@sipsolutions.net To: linux-um@lists.infradead.org Cc: Benjamin Berg Subject: [PATCH v2 2/5] um: Limit TASK_SIZE to the addressable range Date: Wed, 12 Jun 2024 15:48:01 +0200 Message-ID: <20240612134804.1626427-3-benjamin@sipsolutions.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240612134804.1626427-1-benjamin@sipsolutions.net> References: <20240612134804.1626427-1-benjamin@sipsolutions.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240612_064835_089115_2A2782EE X-CRM114-Status: GOOD ( 10.17 ) X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-um" Errors-To: linux-um-bounces+linux-um=archiver.kernel.org@lists.infradead.org From: Benjamin Berg We may have a TASK_SIZE from the host that is bigger than UML is able to address with a three-level pagetable. Guard against that by clipping the maximum TASK_SIZE to the maximum addressable area. Signed-off-by: Benjamin Berg --- arch/um/kernel/um_arch.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 0d8b1a73cd5b..5ab1a92b6bf7 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -337,11 +337,16 @@ int __init linux_main(int argc, char **argv) stub_start -= PAGE_SIZE; host_task_size = stub_start; + /* Limit TASK_SIZE to what is addressable by the page table */ + task_size = host_task_size; + if (task_size > PTRS_PER_PGD * PGDIR_SIZE) + task_size = PTRS_PER_PGD * PGDIR_SIZE; + /* * TASK_SIZE needs to be PGDIR_SIZE aligned or else exit_mmap craps * out */ - task_size = host_task_size & PGDIR_MASK; + task_size = task_size & PGDIR_MASK; /* OS sanity checks that need to happen before the kernel runs */ os_early_checks(); -- 2.45.1