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: 13971199 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 54ADB1E1A32 for ; Wed, 12 Feb 2025 03:22:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739330523; cv=none; b=jzRB4UuwULPXXPkmbW4BrBs3wbSQFk/ZgQBZvyLbN4HnLeiwINHVJJceI+RyRVQdjgeKdykcjfnIarSvv65UX0NZi0urJLNGzBtIR+agEK0BuoHpQ4SYWDqLLF4guHxpYDHPJkV9OUoPsVDwI0tWyPKJqc08bpSpC6W13wtkYrY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739330523; c=relaxed/simple; bh=vaPHeEEUVjAtZeidG2hNXfFKCf7yTmWopFw9HmRLawQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ANeWodgaQP1c368o76xUzbt+jOjXJTr8sZGBZ6YQy4VZpE0ROVwAA9J+4RBgccTuyhR/AiGX1SOMV9xKvMwBUe2gmQpwqLYezwPzJh0fDzxovJF96jdBYmTMqfU3OA2V0nmuqwo7KD9aNfTBRTtUUhKeI1NZCFJoiKkYZ0jfIaw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=g4fzrQYR; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="g4fzrQYR" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21f4aa501a4so10595945ad.1 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=vger.kernel.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=g4fzrQYRZQn8oU/MkluKtm4c4tfyjg0lKP1WP/EccputHeDTs9CVEGRC21WSYmUW9P 9GYsvTmiMKZ9IcV/oeH2zzR41YqIf6gMQwX0OIUazmdE+Nk1yQFqe/i98OeqMscwY6Ev SYGHcSePt1WWnh2Aim2cwItO2U4IPkMEgLO/0= 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=AbTduzev1rFMert1enoouDFA4CbGuLztIKGKSByx5oB8TzFT1YVuZCvL2IYGGZgeQE iLVAhIlJ+ApsWoTQzzwRpq9o2C1OEnuBx6QsoGSaWA1/eiEuTECYTvnIoxifVhP0TYaj G8cqjuCkTd+1xmO6EkU3q2X70wT8nk0nXrxa/xKqs5agKiam1iZ4nMu9Ye9aZILEd6tz sZFxrG7KLKzhDazeIGVH3eBE01cRaAJY6OIY/vQwcZqzrXIM/0eI/UmDtpoCEbOAV3bH 71CUkX5AN6tJYc1Bg7KQJQt2l5F+lwAogoaDHZRdhNvlYQNsN0ADNb5DCy3H3JUDiW2l xHMw== X-Forwarded-Encrypted: i=1; AJvYcCX8JuhLQJFADtrXQ6Qji7Hx99+hiMwjFCUt2HOi5dg8s5v/FJcFwmG8qyJrG3Wr5FyDQmmlQBMugCjzPi7egdA=@vger.kernel.org X-Gm-Message-State: AOJu0YxPCosMUQ7SOjVe3VnNcjAmkqgIjurCAWrcD17zGqVN8oxkzaiU jSsjxqEEmIobxL/Y8cT+c4r14Rq5klBAnTICKciYxMmuNphL5L9A3KMz0t1kUg== X-Gm-Gg: ASbGnctcRuCIIQC/GvQODChhI0H4P8UntmNA9v6JK6rfeErfedeNGu+X1BnEVwNdcCa LKkRxu1uMbqkfYELmH99p0JOZr4TYZ+56dNcKP2EOEtOSs1xz78bEI0QWibM+AY1SM5aGG5lzt9 yqX+meQWRfGO73ozwJIiIkB08VfWMjfXlAD5QPPIizlIw5AtlA77tgvbzV84+pyqTZE75ENM6n1 +bEZR9xBS9Z8n4WpAmh9sjqg5/ZSGEEJwU654euCGF0Z7Go2L6WAN+5gGt584+c1wF5Gdpwcvxz KPOML0EteUkTk4B+/RGcSq5dRgaguJyRKMoIxLf02kAfSGNlfw== 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> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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);