Message ID | 20250210-v5_user_cfi_series-v10-9-163dcfa31c60@rivosinc.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 E5BC3C0219E for <linux-mm@archiver.kernel.org>; Mon, 10 Feb 2025 20:27:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CE32F28001C; Mon, 10 Feb 2025 15:27:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C6A88280016; Mon, 10 Feb 2025 15:27:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A948B28001C; Mon, 10 Feb 2025 15:27:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 80EF3280016 for <linux-mm@kvack.org>; Mon, 10 Feb 2025 15:27:14 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A2575B0B08 for <linux-mm@kvack.org>; Mon, 10 Feb 2025 20:27:07 +0000 (UTC) X-FDA: 83105169336.28.0ED8324 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf15.hostedemail.com (Postfix) with ESMTP id 73915A000C for <linux-mm@kvack.org>; Mon, 10 Feb 2025 20:27:05 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=tDJK0F9T; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739219225; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kL+yIoSlkTX0SokBaTv1DsPGjl4jKUPC0i4GBiCWGFY=; b=K1m9PhrSsqH5an6RMphux3Rd35WVsuY116g0ElYrGC0fI0TYAqGFnpvDEgYsC3ONcb+VQB cau/sCTTzZKdZ43g9AUxuecdMa1Ba7FphRf8Imubfc0lZrgqDw2R07L/FPoB2iIJsjzdZm OcTF3sT5Vpb+ktxBMFE9LNHQI0u/N5k= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=tDJK0F9T; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219225; a=rsa-sha256; cv=none; b=jYqBB/jUXHO5YEkxhlfzAlVr0y3Rl0NlWMLA1GwEIxBNWnT08LY3hn2qKLGXWwDhe6X1DQ LZ6WwurXC2cr4THpZTA1Dp59uWUd+h30PcpuqCk272Ma6jnN0L4OCEb7DjfZLqT89BjRmT bHJsTFL74y9E8dOgXGoafeNnIqw2xhE= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21f2f386cbeso88901985ad.0 for <linux-mm@kvack.org>; Mon, 10 Feb 2025 12:27:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219224; x=1739824024; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kL+yIoSlkTX0SokBaTv1DsPGjl4jKUPC0i4GBiCWGFY=; b=tDJK0F9T10pBBDEimOd6FXokkItzLp5PuhE199zDJJvqxlZjkNARVKl9eMW22Iua1D rWQZcKZ8H/PbP7+x7utgt3Ti7wTcb+YidfbgZRCg0yb29eO5bWz0R2Nv80dfgxpLL781 vLQBbqpF5nDZT5EpxDYUGIAvRjnvSkB50httgJRRieddazKHg/znabSgm5u+3i2JcfZZ nc64XDX/Z/izUd+3+B/7bjp0AKHf1b5VosDWoaMcpU15ytTe4piXoomX5GUTJn2+O05i LBpd5sJaY00aTUf+icVG3VIuMaoAVB3Q8aFAr0ktC/XHWEavHlD/6GYBcwu4gFovQCbD Of2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219224; x=1739824024; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kL+yIoSlkTX0SokBaTv1DsPGjl4jKUPC0i4GBiCWGFY=; b=JuCk50WtTWqnaQj/dr/oywE3tAGYs37vtqLe3cFgvGxJ8oM2s1if5A4Y2IBma//Lt/ RRlselWEMGFmJNdyRok5Jt5eoQ+aHjv5dloo/06JsadxgR/6Boqku7WOq5wif4H0mqom +O+GmCF8u91tQQiydfmVzHvlgCLeSC2Q7ailjclRUfMJRkxS00oWGH/TqJ7DSwH2Okho eeQKY6Lyfqlh6XAr4+wydLmD/T7Xtf+3dwc1AgS9KKcvDJ1WLTRz1qe6w5YVObYceU5O 6yjsbRW7TAsZFF4/hPYnFIgp9AbemnelGEofS/ujJd+9oAFswR1pYJsIqwvrcww/7peW f/rQ== X-Forwarded-Encrypted: i=1; AJvYcCWBOP3iM8kt+1oTYVXWBOHjS/d2RUt+fnS2IHySAqnBfn33RlpPQBCn0OYV5+dGN4wmg3lT8j0ndQ==@kvack.org X-Gm-Message-State: AOJu0YwLc5cifQ9k3kQoaGuszTbF4A2+qKBfUNKX/86DuXVI5wah4k2h O1AZYW70hfehBB+oK4tjP/cyiRZ7RzmOAaNGYdnot8NOtnOKP09cXli7DnDHd2c= X-Gm-Gg: ASbGncsfHz/29OUZH7ZKm6czn2+HZov4ekvqNF1EmOEZWjnyzoa244dMUDsOVW6ms/9 8BV5fOAS47QWR0sEGPVIe9qsMGn3D0v0BFuhtLXP0VvKLY+NTu0sB6TtXRfAnc6kbxrbp+3N4EO tV9BIs/zhStNrm6AsELACfM8qYT66rwWa+hSNXGeOryM1vueSSE3QbLRGcMo0iY2JPgbAzRmW9n da5TZRAWXroMQ9/JO7zAfaYLBjwZHKe034E/3R0WF7PBLE5Hiz3oGtHm2+k0dvW8n6NkllJgRvQ SnePM76OXCTIdZX5R/vGXHgpvA== X-Google-Smtp-Source: AGHT+IH51GCkumMcFJPAZ0u0Kjg1gihjqDbfZuYLpqygtJdnaOIjAF7ExdTAshwwxxeYa5aWxibyKg== X-Received: by 2002:a17:903:2282:b0:216:48f4:4f20 with SMTP id d9443c01a7336-21f4e6bf3e8mr230190345ad.16.1739219224426; Mon, 10 Feb 2025 12:27:04 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:04 -0800 (PST) From: Deepak Gupta <debug@rivosinc.com> Date: Mon, 10 Feb 2025 12:26:42 -0800 Subject: [PATCH v10 09/27] riscv mmu: write protect and shadow stack MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250210-v5_user_cfi_series-v10-9-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>, Andrew Morton <akpm@linux-foundation.org>, "Liam R. Howlett" <Liam.Howlett@oracle.com>, Vlastimil Babka <vbabka@suse.cz>, Lorenzo Stoakes <lorenzo.stoakes@oracle.com>, Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, Conor Dooley <conor@kernel.org>, Rob Herring <robh@kernel.org>, Krzysztof Kozlowski <krzk+dt@kernel.org>, Arnd Bergmann <arnd@arndb.de>, Christian Brauner <brauner@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Oleg Nesterov <oleg@redhat.com>, Eric Biederman <ebiederm@xmission.com>, Kees Cook <kees@kernel.org>, Jonathan Corbet <corbet@lwn.net>, Shuah Khan <shuah@kernel.org>, Jann Horn <jannh@google.com>, Conor Dooley <conor+dt@kernel.org> Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta <debug@rivosinc.com> X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 73915A000C X-Stat-Signature: k115aea5ruhtp3t84hy4j49ksuuekmas X-HE-Tag: 1739219225-611361 X-HE-Meta: U2FsdGVkX1/gy+RK+DAo9Y8lS9k5iXQfe4ndcjJA1Iv8Kp7vV5DlOkliwWdNzZjNccACFyq3uSLRcVKRdX/gVl/aGu17N/fb53+KAUNNv54CZQamefr3BAgrTaFEDdxe55Qy/lCquKljWFXSfVVZHnM2EIL/S7kYp6IMX27p4/y8XlNQMAloGnPYxVhej9/s5AQvtDc3+2B3IPY3EyRCUUaqeh2lF1uY+tIt4osQaTYyN0DfkbXISiGadf0vMVrJMqsVN26gKQUppgAdu7fzsQt9XDzWFItGrDEcNdyWJY2LX4uaDki7MCqegm0Gf3n9ALpZASPxK6nudvjFnkSYj5dSzmnfvi8lfNL75FRWw/vdpAy3E9M/go2U/VEttg2se7vYYbngVBWgtPGTbwiH/tqAcqU9gAJuf2DNkREvzdkTl/1QbBUcZB72stwotsVgcFCfArT1KVcQFNB9wvz0hvAXnE1YuMyBbJtQRzkPeDRf8fdFuE/NutrFglwvnwYUQTy/aoXj8hVCKldGFWtYwoVnqxUfe0pQyssBT6pOdQpvj0yLojZ3EmiwryIGKizq5qEf9rTRdxnDs6LzibofHTEbNZ4jWHa4CoMFzkiJFGQ8dEp2IP/RBJ+RggXdzgch3GDYJhc+rHzBavQknBdPqq410PRGcHcd4hfgwewF8DE1kxmKJIzCWstb+Q8CzEAPiiT4cC3M50pnxthJyDR24hk3apkk75kfHLNsF4q85gOoAJ19E40O6GrvSrS/kVrb1EFYbHdn4hq3V+SOa33aQvGFuqg72lAjiIhdVhJUQbGKm4yyr87483IqDSUG2tRy0s1lEHMByTax4cu5sdxL0XCUh51s3RKCxQjtHrnjd5gooGpGL6F5f9ZL2sVL7HqMd39ZjDTeb7d6JxdE1LG155nYWWsjUGuPzASZpBogupm2dK0+eEJgTmON49HSDwJ+cT++oQFoytr9vledAEK qXcLV002 1QGkSfugoC6hlxN4H8480+UHCcno+oXS36arxYpZ4mzV/sGD2hNo54yDBSP75Rn0Goig+qHZOWtU1O6TLKMPztyORE9rPhKxThaOvgTmXrLwINpifV1qc5Ke1oOw57ClthLLv8N6X3RhLrly9ra/NsCg1COUdMNPA74Q8uszRSob8BOD73gOhvYGX6C9kWDkOqfg8wI/sUJ71gSjHFWCdPBZSkKPV/7l+q6jlmdj2+k1njcYpKLcbrV6XUBV6USLXRZOyOpdR8LYShQ2nmFki5KlkXcv8JWH1aHt7GC4gwzSwjqWXAKnO8kU2gLTTDuSlgZNa3aEjmZXKlK7/I8Ff2z5QCrVNwr5l8BLz0LNz51grJNrKjx8ZrQmBjHMwPMvCJfHd98c5cQnEnyJPWuxJMa9dF7WQuaFezaFUo6qlSZEqRfUjvyvB0uRkvBC0UdiJmCMJfsr9pnRO+crHp+LgQCtNUw== 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: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
riscv control-flow integrity for usermode
|
expand
|
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index ccd2fa34afb8..54707686f042 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -411,7 +411,7 @@ static inline int pte_devmap(pte_t pte) static inline pte_t pte_wrprotect(pte_t pte) { - return __pte(pte_val(pte) & ~(_PAGE_WRITE)); + return __pte((pte_val(pte) & ~(_PAGE_WRITE)) | (_PAGE_READ)); } /* static inline pte_t pte_mkread(pte_t pte) */ @@ -612,7 +612,15 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long address, pte_t *ptep) { - atomic_long_and(~(unsigned long)_PAGE_WRITE, (atomic_long_t *)ptep); + pte_t read_pte = READ_ONCE(*ptep); + /* + * ptep_set_wrprotect can be called for shadow stack ranges too. + * shadow stack memory is XWR = 010 and thus clearing _PAGE_WRITE will lead to + * encoding 000b which is wrong encoding with V = 1. This should lead to page fault + * but we dont want this wrong configuration to be set in page tables. + */ + atomic_long_set((atomic_long_t *)ptep, + ((pte_val(read_pte) & ~(unsigned long)_PAGE_WRITE) | _PAGE_READ)); } #define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH