From patchwork Mon Feb 24 22:52:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 13989026 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 69E1CC021B6 for ; Mon, 24 Feb 2025 22:53:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 082C2280015; Mon, 24 Feb 2025 17:52:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EAD0D280001; Mon, 24 Feb 2025 17:52:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8A06280015; Mon, 24 Feb 2025 17:52:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id ADB46280001 for ; Mon, 24 Feb 2025 17:52:55 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 644C41202B5 for ; Mon, 24 Feb 2025 22:52:55 +0000 (UTC) X-FDA: 83156339910.27.DD7E85E Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf06.hostedemail.com (Postfix) with ESMTP id 75F8C18000B for ; Mon, 24 Feb 2025 22:52:53 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=c3alEO4H; spf=pass (imf06.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.178 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=1740437573; a=rsa-sha256; cv=none; b=264pZ3ilIAOCUyABu4E330Zc2gEeZZeLbd4YbgNwie4Nm/TBgjHnRplwVsyvFmrauJJlK2 IXJGqYQS3pEG1DUAIOxyl1DIywXNt001mXmSs9ysVfgmMovRkWH31zZ6HuWquYiudVpXDv bgD/fc2QLoQWc+5fDivCgsRUuSAES5s= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=c3alEO4H; spf=pass (imf06.hostedemail.com: domain of jeffxu@chromium.org designates 209.85.214.178 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=1740437573; 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=9JxfqC34JK5pAuQi2kIh7I1xgd0YTjcXZqYM95ZHnLw=; b=u0XrZCl63GkTJDmeOoV3kdD7m1/rPSAoOaMLLDaNf2cBfK0O999TzxMnxL+Iq8j+dPX3wc 0g6MzRJLEtjOdl/ZfpjftBnzAgK2sz+lr9jlt4FB62NZDfjwQ4MXxQVdjralFrZTcMk9YA hJ0U/tI3bu41JRtJYiw2yedR7L9IvQ8= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21f8f3bd828so10884225ad.2 for ; Mon, 24 Feb 2025 14:52:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740437572; x=1741042372; 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=9JxfqC34JK5pAuQi2kIh7I1xgd0YTjcXZqYM95ZHnLw=; b=c3alEO4HD6CGVGSR9ke3+IrmurMIMDPGKzTm700qFSCVn+TdiXXnRl7sSFRqIsE4+m JkfSh0H4tHVUFwty+OSRyUASVKqBTjdW7ASok/zFnYz2k+t4hqLj32bHyPB/ZJYMLPca JKoc/wfsuZCVuiX+x/3WrcWaidhD8j9mRWEzw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740437572; x=1741042372; 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=9JxfqC34JK5pAuQi2kIh7I1xgd0YTjcXZqYM95ZHnLw=; b=foI7wrFxT3iw8hQUUTy1XL+6Lln8Bs8LmetS8sSyg8y0E7LELyxB+1Il6EA+AyCKNQ fnDfwBkP1vbcCUud3J2h5CYVAz/SoxH4/XHJ5HskLNRPSiBO9XHAXaf4xq2Azlnsmci1 kZ3HC9gBgxmfaZr6TlBcPl+sk+6UVDJEQx/8hYRXpIPaVE05MCifXYXDf818Eq9UPGZ9 LtyEX24akZlvLcRJQSceFiUg5NvJdz0sr2YJ2h08OtzbUs3qAf4MLQORxl3szr7JPX1z g3qE9QoqJbmHZoqyCFeXvrR2ldz9F0+GzR8uqcmhJrCKVTMF4jXBFccV3SkvUq/N+gNI zSUA== X-Forwarded-Encrypted: i=1; AJvYcCXbu2nXf3AQc7HBqprzNf/9pwD833jfXsecApEwjVSbmfvy2ZTd2iuvH9HRw0wwJiIAgiuob6vzfA==@kvack.org X-Gm-Message-State: AOJu0YzxnX2a+F1j0u4lV7Ts41Zj94l4rN5IhHzpRy1oIPM7JTQD1Eb6 JFTGGeb2DwdTTwO0ZAWCJtcra7hNtrjudPIwAWvPet7VXWxoFkHofj1g8WJgxA== X-Gm-Gg: ASbGncsI01rUZPdB/kJJ1aW6q4Xar7/YpB/xaQZzDSjLcJ4D7MGQBpBhEghpzXaN/rw 89a04RUYueufXja2iZBoNRQXuXgV7F+/vPcVfXVRLtLdMDEbMEd1yKtpVm9q06wFqMCjy9qTtr7 1oj3KMPn9IhOpl97054/zp5CNcgAlQizLk2NZDC5sjqRgw2mzbUEXhFs+szH06IiVLbIkIX2RXY D2JHGYyeL7WoT6eFGykGZho9fWyuuALT1vd+1gtaUmjYtV6P+wV582gMy4ObTKdrEfpFEcLgNPN iNwO4AJDP5Gb/HyfePmSstj+TeAf/lvupkfHJL+Gs3tGoFIdmnveK+FxpDpi X-Google-Smtp-Source: AGHT+IF5qFqZ2XMAkd11tZhw0TNlD5KvpPShH7QiyA0ymh3azQkuml1yZnRKVOO/3ENETx0NVF9uNw== X-Received: by 2002:a17:903:18d:b0:220:f181:4e70 with SMTP id d9443c01a7336-2219ffdfa48mr97695445ad.10.1740437572458; Mon, 24 Feb 2025 14:52:52 -0800 (PST) Received: from localhost (201.59.83.34.bc.googleusercontent.com. [34.83.59.201]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-2230a095f02sm1313475ad.152.2025.02.24.14.52.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 14:52:51 -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 v7 5/7] mseal, system mappings: enable uml architecture Date: Mon, 24 Feb 2025 22:52:44 +0000 Message-ID: <20250224225246.3712295-6-jeffxu@google.com> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog In-Reply-To: <20250224225246.3712295-1-jeffxu@google.com> References: <20250224225246.3712295-1-jeffxu@google.com> MIME-Version: 1.0 X-Stat-Signature: cp3iwtmppu7fjx61oybpx4w6h1zcygdn X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 75F8C18000B X-Rspam-User: X-HE-Tag: 1740437573-457357 X-HE-Meta: U2FsdGVkX1//aXuprlYCdOZWIVmsiIjvUTUru6GpiK25YF1CCvUgesq/NXUgpOAqgB6VMIaKr+7KllF+dq5uCwhGzSkj/aqQjj/pgTGuL4glwL1t9c9lvDWF4sptW730hT4Yz4HWyi8omyFbtjNkqnXiSmE13k/MQldL2OCIc6t4DcJ4s4SggqlEGttj2VJM1VCrqlJIhM5Elj2fHQ5myDy0md6918vsK4sTJxxx9AieS3idt3SUhwuY28XTGzA7cPf0Xn4Ab82LYcSeOE8ume6It9R38sbd55Nfk0e9RM+tqm9b0DFRweuaIOvWCI5Qb77qs7EYFumPeJvKDy+yIYcECbq6kMSA9wyFZgrBOAiTljFVjfnrNXtu1hkgKP/DdPw1q6Uf1dt9zhGWQG6mQTpk3w6T8WcvFTnLlNnRZMahnP9FW+zWWpKoDiVpwVHFbSyHONGZ5EVMuhyGkL9/WW4wxg+2Z9lq5q8/w2mjUtXtBfic/PHMzD0mEMkuAu31brPOb2kYZFcwlakUXr4Hp1fmWsVEH7Ah5gNFgIcVqDmtq06Ky5Hyst/i/F6ECmdiF3JmHRfPKXH+V77FsMAPXFuCO44KtMoHMlrdQaU+NmbYFDt6yew2vVL+JxM11cC0adJ6XfQMk/rzSyX681tajyS/lRG8UIeAqEyEzWhdI4XFmGsvNjJn1Wy/aOdnuRVsonNR/3RMdtc/GEs85S1TkdgbYVWO+ENIQPJuPPFU3R0X7SaX7/qFUvm+BGRtWj2lHvUo72O1jPl+eDfAYKjNxptKNSOw5WlNWzg/RMHZd6HYF08JsvMJnBGQIk3Q0ZcTjsSCDVmw3Ep/GOCIg/lB7PrHediMfbNm37O13hOQJnxOXvnuUjKs2LdVoRgcMNx+qNlAfkrH/0nC+wvdLXFCysBsIIOihHQkJKM92t/AoHAeMo64GHx4Wm0gBXllzsDaT7R+2j+UDqZJW+OR6UV E3ICTpVs xfcu2aI4MM5qpG6h1TYvUaRAIKXAjiftjBsSpRpLagZdt95ps+QnGNqk0IEMJXXlVsyCiE3tHe+/Wp4tMyYjjX358UlT8Tu8mmtMNYF8fwrNFaY788AV4Rnf9KKYbXk9O6ZTRtAheICdxysBxfynpq5BNmyrQ2iClm84LUXJAttQc/OHPpzgMwdvd12tEix48pLRcULv8GPNS5giHfwj4d5H3Pt4kGStqX3KEjUE5QmK3LUPG9LF7LrFZSuINOWoj9iJHQDypilc3ItaEhymzWnILNirJ28ux5IDDJD6tAoZ1XOwMgGtxM5exeT0jyCS3/XZRfMfNyjMHfRygnmuhN6rj0aBC1SHxqXBIDYlC4NbIIZtmwBY4+D71BboUQyfR4Oq4tpRhODOfF+c= 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..fdfba858ffc9 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 |= VM_SEALED_SYSMAP; 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);