From patchwork Wed Feb 12 03:21:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13971023 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 8F404C0219E for ; Wed, 12 Feb 2025 03:22:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 217886B008C; Tue, 11 Feb 2025 22:22:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1EF026B0092; Tue, 11 Feb 2025 22:22:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 065896B0093; Tue, 11 Feb 2025 22:22:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D720F6B008C for ; Tue, 11 Feb 2025 22:22:04 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8F532C16EC for ; Wed, 12 Feb 2025 03:22:04 +0000 (UTC) X-FDA: 83109843768.16.56AD404 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf01.hostedemail.com (Postfix) with ESMTP id B4D8A40005 for ; Wed, 12 Feb 2025 03:22:02 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=UA0TnH9f; spf=pass (imf01.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.173 as permitted sender) smtp.mailfrom=jeffxu@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739330522; 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=9CGVA5eSPFfsHEVs7rjQnee/yKRru+0Ft1a+zzsFXds=; b=ryl0AyFoOYEThP2Jp/phuEqthOKsXf7tJi8wqWvzLE9/wr//eXTAJWIGch219g3ZE2yrcQ s8erBP8NmDq7e0OZWM8GBD8bDzYjPtvc05UywyUBrPbFGVAnVa2pD5ousbeTJwv4ifZKUH ZtXH6SSBPGFhALxEhaiCNwSPVjR8OYw= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=UA0TnH9f; spf=pass (imf01.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.173 as permitted sender) smtp.mailfrom=jeffxu@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739330522; a=rsa-sha256; cv=none; b=CgIFOwRiUJdut65loloIsOw8TEV/CUaWrXvnmCIFuyfE5DmnRUWFdyUAwi3Vh8RkNymdVV nASelRnU0HZwYrlYlE9kdHyXOBbhUlaa3gQX/W+8AgffdHA7MfrGltbFaF8m28zerxsoKY G0gi4exoyIUWwR3Z5noNVUk+lyGPjnw= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21f3826e88cso11821335ad.0 for ; Tue, 11 Feb 2025 19:22:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739330522; x=1739935322; 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=9CGVA5eSPFfsHEVs7rjQnee/yKRru+0Ft1a+zzsFXds=; b=UA0TnH9fXbWYy/EpWf4sJy/cjC5cK36dTOCFrBIQTERSBE9xldOcUruIgEcaUtxUIf qLybHKWpnejDDhWqgW27l2gyPqVEXKLL99EBmG0zgNzt2g1Busb8Yx1gup0sSdCA3STh RH1QiByqDZc2+Sb5cZg4MLKuhGH3fFhgZ5fPk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739330522; x=1739935322; 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=9CGVA5eSPFfsHEVs7rjQnee/yKRru+0Ft1a+zzsFXds=; b=w1JXg0Is3uAsWQEDKX2YBGyrxtjKk7LCFfZ+kaBoZ8w8T8p/Kj2K7KKIHEErkAezOY tUmfQEHXFlK+YmXN3BKYosQONBcf6AmH6lF+RkLquQqpCMUmwxL2/396v+IHOr3qcVMC MYQ3at3pvY/nuVP8+THfAg+nkoZcdxgUMn8YkSEjwkH1zpixV8Chu2+Q/Wj0XL73Ctof /ovBS/zAqzZMucjnrQl9bZt2z+JBvKqJjCKnx3/dsYxhRXy3LomRQn1IpKYiNyvepIlU 18jWs2GC4m9ZWkVIOOr6Z8NnS6vlf8uPYioLK7pwXLDHBuEerabZ+6JTD2T84+Ua3HOL qEew== X-Forwarded-Encrypted: i=1; AJvYcCV9K/12RxGX7tpthW8PXm4oxMVxWvFNTP2qgUOzdu06QAtz8FvWrrz8xdwknHnVbJDTkotrDlj85g==@kvack.org X-Gm-Message-State: AOJu0Yyt+xVUOfXRd3vyfwsUBBBnEZOeXdn+JjZYy2fvxjrhDpQvWKuw qOW6ExA/ORq0ICqCZtPPePZ7q5RBBYcS9w3QxS6Fo9h0feo0GJXb6wcBo0N+RSnJThWTERdRI5c = X-Gm-Gg: ASbGncsHtP15hIeKISs+qo/AiLorakjAau5PaKAaZ+olMc+Xj51fmK8n2e5A24lDnhB OuZ4SI3gfsFP2yKAzz9cl49VeNAzlG3pJaV5sExf/0FJFv7VqSOWsqa8oK/+a10gPjze+h+1aGi CNBFDITpTwT/AfU7RLzW30eibHv/lkhAsNLFC6htIW05egmARREEXD931FTixvErp6ZIHG7LKWo mtdIh5907TnUCKrdBnyT/dBXLSeTdBbBh/pSYFPURaRK3LKswj3UWcD9XceC0yiVhhP2HiF3q2I Owqgrcr/YkpH0mzL61Dxxxl3dU/+z1/tAh0HxS6nLQ34q/QZWg== X-Google-Smtp-Source: AGHT+IGRZPknLjE2cjsyC6HVD4KIdBjVV6wxieEwLxc5+sxlPK5wduEZddMX8O/rsN2prx5qJfmRrA== X-Received: by 2002:a17:903:22c5:b0:21b:d105:26a7 with SMTP id d9443c01a7336-220bbb045admr10703335ad.6.1739330521639; Tue, 11 Feb 2025 19:22:01 -0800 (PST) Received: from localhost (9.184.168.34.bc.googleusercontent.com. [34.168.184.9]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21f3683d8b2sm102324115ad.119.2025.02.11.19.22.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Feb 2025 19:22:01 -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: [RFC PATCH v5 5/7] mseal, system mappings: enable uml architecture Date: Wed, 12 Feb 2025 03:21:53 +0000 Message-ID: <20250212032155.1276806-6-jeffxu@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog In-Reply-To: <20250212032155.1276806-1-jeffxu@google.com> References: <20250212032155.1276806-1-jeffxu@google.com> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: B4D8A40005 X-Stat-Signature: rji8obgb69qmrr78ng8aieefg4zs3yqj X-Rspam-User: X-HE-Tag: 1739330522-724155 X-HE-Meta: U2FsdGVkX1+jFx60vhh6TNomdsV+9QpOQgi+7sxS5DQYq6xfluXX+j94k5Uv63u3pftHf6cKX6WyEvIJ10YjaAqTuiIMuhq5wLL0XreoUvLVKOZw25jEhtr4g5pitK5AUhxtTx99fV5uhi2dCTfRWsW2Gvdck51OLs7Xfy9nWIG1oHu6OOfHj4GNaNmycxA+s2ai36epfDOa1rX6YwwcdwhNfTuSWdE1QycQEnFVIGKxhbyRU0RnL8GJa6KO9mIOf/Ozc7vl5f8HdEbimxJTl7pq3kX8HwG1tSwI6FerEDeb6+/Swn1G1/lploUEL40Il+iZCbkL1CgwHE+f+VvyJjJGGwz0k+G14mpA6aWhEyaWSyPvKVFCQ45fr/fBXx5DQfu7ffZlSmTwKWxF4dUBg9FisK0rqCDM5JRO6hg806Y5T3gJGowaAsfRfra64zhEYBIdzDhAsLzLV9A7HciLACPigN3LeABSqPNsZAhaaARTE8UC6/NaWR2Mdmn7yvToZp0lzW2esUGdR8P+FZV9hwCg8vOxP1D5fn9ddf7xFQPOsrXfNlAjQQrPkmMk4V+Rzm7sCufYyKQB1woY9HG/AVJAWxZuOL790B3uFq5+JGtD/hjN3ERWVxitPiScgscfdCgFWaZuY3dkDy/8r5Y95wPBLcR5bl55LK/cNRjgIu78iY+t/5UvQL0g1r3NyvoGIQykDjg2vp38vGzVgaEHajM11O8LY/wjfQ4n/UaEUFoUMZboCWpD+wIlLiDrbUIjSwVecT9yDF7UL50A87ipmY/Wrk/QyIGxdksMOj3dFrO2oagFTAsdNBN57LtWnMrAkxqnpy5pLiqBsoPtB4/en97UAF5+Up/TsAaZG/8Ca13d60wXtXI1KnuI2yUIXqxVpkC/NNkVWlOojaw6TKAa8R7tPh0eq9b6BfPEWRakrZgEEvmWJesD6dy1vKJEQAYm/pnlbmU6F1CaPn2Six6 /xEd+FPD mXIn78EKS8j413bhVvmJVWVIQmPB5+hPp9XixQi/ucZfu6aLXdLUVRQQPeJleouuIkhdEOVVxBZChKQaV3AC22A6JMdaOt+FjqV1SMGryyZJJPKFpkMPOWUMfQo3cjJKwzZOdNitx7PsYpJY46SrwleQQQDzhej5i9Us5b7Xm+bRSsKomOwRWswhFxIG4oU3XsSj3lg2J/LnRI4a34ntHwM5enpKEMtPNAl5S3hqnt6R4SgPa27Qkk4RNAFyqfNEiK1XfNryibTyuMAk58PbibLaIb/X4vZi+Ex4rAZHLytpubChAH+GTdiTM0eyQtVvkohA9PuiJx3DrYeouDZf225yLEkZ7J+SC5jruiPCD/IfqfHqauzR5UiZOv+nYXH0PXPyJRMIbvL6Pr/4= 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 | 7 +++++-- 2 files changed, 6 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..a68919db0ff7 100644 --- a/arch/x86/um/vdso/vma.c +++ b/arch/x86/um/vdso/vma.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -54,6 +55,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 +67,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(); 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);