From patchwork Mon Feb 24 17:45:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13988620 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 045A5C021A4 for ; Mon, 24 Feb 2025 17:45:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 39D62280010; Mon, 24 Feb 2025 12:45:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 321E928000A; Mon, 24 Feb 2025 12:45:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 126F0280010; Mon, 24 Feb 2025 12:45:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E0E1028000A for ; Mon, 24 Feb 2025 12:45:23 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A1A6F1A19EC for ; Mon, 24 Feb 2025 17:45:23 +0000 (UTC) X-FDA: 83155564926.01.171FB5A Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf05.hostedemail.com (Postfix) with ESMTP id B7CCE10001A for ; Mon, 24 Feb 2025 17:45:21 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=kxwg197F; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf05.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.171 as permitted sender) smtp.mailfrom=jeffxu@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740419121; a=rsa-sha256; cv=none; b=JhgG9HOXNxpulU7v7irSJ2bB3m9dsrmsM8iohbsQxJipEcZjEMg2AkPjIrkeHDWNWuEhit wQ5cGjqhuFmaj3ulLtyn+PQImg2lbacxy1AEKi70PrsQOPVfulBUMunsmeZsWXjpELFtHi oBE9W0+7h2Zk3HS8HjiWlEGrsLh50R8= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=kxwg197F; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf05.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.171 as permitted sender) smtp.mailfrom=jeffxu@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740419121; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=uF6v4BAgInjRNjkqN7tLcQhcZv2LNrGaf63b7a8eFi0=; b=VhalQLhuA2+ow8mfWkUY+lYuaPICxikmsDTCT4rfyBbpfkLn/hgk/jKSg99lrOwOdTCuQT SMxiy7vEHhFHLp0OmqeL0Sj/mW/R+CYpCLkz5xPLty9/39eJQThXhGgm3hU4d4vm8PI8ZS Fc3T9D1/9bFwIqTY1HTAdubeZ68QP8c= Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21f8f3bd828so10200835ad.2 for ; Mon, 24 Feb 2025 09:45:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740419121; x=1741023921; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uF6v4BAgInjRNjkqN7tLcQhcZv2LNrGaf63b7a8eFi0=; b=kxwg197FdtYbNfIaqdlbgud84KsrP7xjgNbT7bs/qVPfoMT4NpON3M7r42w/VpVGGg wjo5a2ckUmBI+APEGl5mO+nfNvqFQb7rRMqlNIerjmD+BIfbiqAf1xMN4xkJOzMH9jRY sErp5d5HiiRnPe82v5WzuXQy0O4E/zxt52JlU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740419121; x=1741023921; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uF6v4BAgInjRNjkqN7tLcQhcZv2LNrGaf63b7a8eFi0=; b=La2nTmGBfy6p5+0QA5MoFmgdenUr9pY6MEaNyS3i9Q3usVJa8Z5SoPwmlNPiF4DZq4 bTLflqPpPfO6dPv61ge8dLrtIDfRkdb8W7fDh+11YHC5H7EsjoaeDE8v+P9KU2SH8WnZ y6MM0cHIefAK1KaRPVHadl1z38KXzruJqkkFEQ38EKqLZ4W2w9WtQijXmEtIRKTmkv/B 2YkgVUcuubfy4+7dDJvurQgxDtuAChvcAb8PyqSNxyBNn+ccCHZgFC9La7an0gU5CmV/ h7Nf3RPKqdKiWHgqEkskglpf0La1ZWV6ZW3qv1PH7nXhcVgV5tKo//FxnmI9dn8zbIOX aoGg== X-Forwarded-Encrypted: i=1; AJvYcCWH6yKH1E2MH7CpV/joZ0XtvLF0tLzh39axy16lTB388JOBFKxHdylSCSibSE+3SfyzwQ56DZoO8A==@kvack.org X-Gm-Message-State: AOJu0Yy9vDWKaEWEysqOy+A0hUIRR9k/p1SPZOxuXjzXV0a6EGCsKjFL E4RK72RSJwagSlq+gKDCIOc0F6uVjN1MN7yLsd/hZrOKYem+EE6XTDdTGsynIg== X-Gm-Gg: ASbGncvPU4qLgkHdI9LsVA2R7fuvYv5p3ggoeoOKi3TdXuhqvoWJQgoedlm52CEq4om aDeLZBN87bihVENGc2JfXk2W6s2k2/l1RApP3DvRPlhxfqckX49R2jmnvD5tNZKFcPgaU4k5WXk Pc6kUDXIEADc4HUPUkK8POFTq8OxBdc+v/54xrpV1DtoLfxZR7pflWMIgWD4NMj6teolFub+Amg 15+7wF8T2Bw5BRFuhIFzl7+Bthff3mlFQMLGmCdr3Ez4RA+h6FuapBoQRpg0J8S6nTQR6+Wd5k3 iw94IQ3oQyx02OQTgjjkmGE1CaK2KY4+BRl6Ji0RNnzQ0+fs7H247kPrq6D+ X-Google-Smtp-Source: AGHT+IHchQT9dzoJY2LEcYJPdtfWM7ipynXQ721dymkyqhvRjPShYl+mqIPBkEeCSpT4D/DXL4HZjw== X-Received: by 2002:a17:903:22c8:b0:21f:b7f5:ee58 with SMTP id d9443c01a7336-2219ff5b3e9mr87660905ad.4.1740419120715; Mon, 24 Feb 2025 09:45:20 -0800 (PST) Received: from localhost (201.59.83.34.bc.googleusercontent.com. [34.83.59.201]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d5586080sm181990315ad.229.2025.02.24.09.45.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 09:45:19 -0800 (PST) From: jeffxu@chromium.org To: akpm@linux-foundation.org, keescook@chromium.org, jannh@google.com, torvalds@linux-foundation.org, vbabka@suse.cz, lorenzo.stoakes@oracle.com, Liam.Howlett@Oracle.com, adhemerval.zanella@linaro.org, oleg@redhat.com, avagin@gmail.com, benjamin@sipsolutions.net Cc: linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, linux-mm@kvack.org, jorgelo@chromium.org, sroettger@google.com, hch@lst.de, ojeda@kernel.org, thomas.weissschuh@linutronix.de, adobriyan@gmail.com, johannes@sipsolutions.net, pedro.falcato@gmail.com, hca@linux.ibm.com, willy@infradead.org, anna-maria@linutronix.de, mark.rutland@arm.com, linus.walleij@linaro.org, Jason@zx2c4.com, deller@gmx.de, rdunlap@infradead.org, davem@davemloft.net, peterx@redhat.com, f.fainelli@gmail.com, gerg@kernel.org, dave.hansen@linux.intel.com, mingo@kernel.org, ardb@kernel.org, mhocko@suse.com, 42.hyeyoo@gmail.com, peterz@infradead.org, ardb@google.com, enh@google.com, rientjes@google.com, groeck@chromium.org, mpe@ellerman.id.au, aleksandr.mikhalitsyn@canonical.com, mike.rapoport@gmail.com, Jeff Xu , Benjamin Berg Subject: [PATCH v6 5/7] mseal, system mappings: enable uml architecture Date: Mon, 24 Feb 2025 17:45:11 +0000 Message-ID: <20250224174513.3600914-6-jeffxu@google.com> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog In-Reply-To: <20250224174513.3600914-1-jeffxu@google.com> References: <20250224174513.3600914-1-jeffxu@google.com> MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: B7CCE10001A X-Stat-Signature: ku7kms5yxbqp4nnmugorthtw7kbpakkt X-Rspam-User: X-HE-Tag: 1740419121-931632 X-HE-Meta: U2FsdGVkX1+CkKB2Ac1UgyCTo//vuF/qNSLg24kUgdutzwsgRGGp9PzI0zWoDG0K2He0hOhhkdLMet8e+VXp4sxh64sVW1KslhtME08553XTC+tn6dMcEWufNlNDJNCoOR4KRr+KOHeiHiZuOZ1qkVhqIMoGwWaqCO2CfFt9JZz6ByJl1ynRS57kili26mVQPg6gaTPze+I0NX1i9rsegbnhoyLVRS+V4MZxY2Vr/ma1/vvUR96MiXFObdfiza4nsbC3sReglGlyRxsQ6ncp0vH2uffoN9zpRGdT0Yr2qvUELmMlu8Hxj/DpjVEEO/nGNvMzPs1bFl3+b2uLSwk0BmR/QxG3dDvz+kjoMYFKt+YoyEfgKiLsRuag6263OUKjzVnvmvziffs5qSjCZXPnUCkdssrWzCFb3fNEsFSl0+UZgIQQReRdZj6ETKhw91s02jUj+sbEvyoaSHpzQnWVGlAnDkanCFtdEj24GN9RiPmZLIdVOydllsLRt6aZrt15RNKqxLsEY0jfkxmXxM+iu/XVKa5jJg0LNIIqvPZqsTS01F8XKJTNl2CXsK4QfCHG/AvK6UHTVXoHs/zCo6QnXA6cb8lczRjPOVjzYVOuy5+ilfwdnX/Z+RU0CTS84hVuNEfYif5YtgRF8imQJ+ii9XEqUFy5JCdMsqoLjY0X/nBLxfqFneMCyoDM28/mFcsn+5PgG36lF2s97fRLFktWbdyxGG7tA0KkVj8Q59KFjYssp1dr/qEhwdNYlP88yh1z3Wcf/cvf4H7xHgnCTHjk4cqvix1VmqueSsHhYW241uU9iYxXka9z5+9piXgFRgrsCC//V/3SOqfexssYjU3yZEuBaXwcd8sa6Ni13zRN5kwYnnbrK+aB5Ek43NT1VmrcvFMi+JK6azOapKjXTbJ6b/HVHq3K7x0E7QjLqsl1oOZERO5uqXoE9Dg3y5idS0hgGdfoKllMyqIEeczQv1z omvybsR4 RoDpAZgQ3ls43UKFv5U8f5PSzEvCRso3+ltVkTt0UsjLPwn9CwPreo7e+aFhkYCJAKui7CrWCrg3Qz6RUwZQKDMba/ocQL3OW/+6puoG7hXC0jzpFOghp9M3g2DPoAjOk26kztdcns9TpQldFSa8YkG5gGDkU2YOP0MrvVFptVh9s9vRUJMCPgryVFPMhaOQ3JhvXGNCRIrSFChykWbVo/LWvDEoEdH4RYubuxL5zES5ZU8ZP4znJZxyqjlDr6xT9CBJtG7DLaET/DGJbo5wXpBpM99Xmn/y081Hp8QQSrOBYOcG5j+pjaNgngbRmfKiKeSBgKWOy2XITd8A87RoWQloveSG8hdmV0PzHjtzAUJsHdgB4KenTcYuY3UhROMu9n7w1unZz1h7zSVM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Jeff Xu Provide support for CONFIG_MSEAL_SYSTEM_MAPPINGS on UML, covering the vdso. Testing passes on UML. Signed-off-by: Jeff Xu Tested-by: Benjamin Berg --- arch/um/Kconfig | 1 + arch/x86/um/vdso/vma.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 18051b1cfce0..eb2d439a5334 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -10,6 +10,7 @@ config UML select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_KCOV + select ARCH_HAS_MSEAL_SYSTEM_MAPPINGS select ARCH_HAS_STRNCPY_FROM_USER select ARCH_HAS_STRNLEN_USER select HAVE_ARCH_AUDITSYSCALL diff --git a/arch/x86/um/vdso/vma.c b/arch/x86/um/vdso/vma.c index f238f7b33cdd..ee6d8a58f9f6 100644 --- a/arch/x86/um/vdso/vma.c +++ b/arch/x86/um/vdso/vma.c @@ -54,6 +54,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) { struct vm_area_struct *vma; struct mm_struct *mm = current->mm; + unsigned long vm_flags; static struct vm_special_mapping vdso_mapping = { .name = "[vdso]", }; @@ -65,9 +66,10 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) return -EINTR; vdso_mapping.pages = vdsop; + vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC; + vm_flags |= MSEAL_SYSTEM_MAPPINGS_VM_FLAG; vma = _install_special_mapping(mm, um_vdso_addr, PAGE_SIZE, - VM_READ|VM_EXEC| - VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, + vm_flags, &vdso_mapping); mmap_write_unlock(mm);