Message ID | 20250310-v5_user_cfi_series-v11-9-86b36cbfb910@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 C143AC282DE for <linux-mm@archiver.kernel.org>; Mon, 10 Mar 2025 14:52:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F77D28000D; Mon, 10 Mar 2025 10:52:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A574280001; Mon, 10 Mar 2025 10:52:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8459228000D; Mon, 10 Mar 2025 10:52:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 67F5F280001 for <linux-mm@kvack.org>; Mon, 10 Mar 2025 10:52:57 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A57931610C3 for <linux-mm@kvack.org>; Mon, 10 Mar 2025 14:52:57 +0000 (UTC) X-FDA: 83205933594.13.401B494 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf03.hostedemail.com (Postfix) with ESMTP id B541720016 for <linux-mm@kvack.org>; Mon, 10 Mar 2025 14:52:55 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=IxskUNjt; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 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=1741618375; 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=tcQzIbKibwtSgXyshuTqZIhzsSRMDrhDgJ4QA6Qs8Urdnaz/LkUTJVNW5hPCss8vORsrmY wd00Xi1hOBVU/H0ZaXanrKfUZU+SNaX/qiIUW54OEU4VO2ODM+ZEN9AfWi5H5NL08TkDWU A9A0B2MkthS3e6Ur3Ma3XEFPMVvs0PY= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=IxskUNjt; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618375; a=rsa-sha256; cv=none; b=8Y6zb0hNSf+EG2U+dB+1h8o3zYY0jCqa5FZQSZD15pJATmSLN514mL4FPC08+bg6jMacU3 1kzx0RYNi5d8ZM23BLFvYi+RX4jLlqn1/uAL2FjHe+sfihnpK4+ub4ji8ZR2CLJu9ns2DY 7YzwQWXpYg9qv8Hn9ga2DCPV8hvwYGI= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2234e4b079cso76866735ad.1 for <linux-mm@kvack.org>; Mon, 10 Mar 2025 07:52:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618374; x=1742223174; 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=IxskUNjtDMNfLCkUB006SJY9zrcNWTZwu5Za/UPshCvtkKLlu2gqpCi7zLDWoSQELD xlFIdkucQ815cwbyHbLaVC6GuCTHJTr7mh8JGvtJxFhzhzbF7B1KXTAzC1Y90ZUW3wqH XqYTmwmtZ/9iOdr9ZVzbVF+drxq0Kk20TmZ+5DW0DEHFbzGKSJ1wq//BxolSczzvk7AN +IM8iN/MdITi//IC+Bw5CKDmqpiKC2EdwzDXJ4COq7L5MdwHjWTc2c6IkV7/hs/+77/2 VN8M1g05yqjLe+1UTzwkXdhYY3pRKvilIHKUMV6VV1bL/sGgW8gUvtxnD9ath8esw/oy Xnng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618374; x=1742223174; 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=s48RO1CmRoZUFgKBFXkJJfIZU/0G0f/ReoWTpUvWx6kBajGa7ZIe016FsZIlVbcFYO 1hKyCDJxfeF87p8ssO6ebDRAVOJYp807vv/H9PzcZcZgW5HjRW9VJpJNkWuZY8xLVaeP mWLY1x2ldW0HbvGnkACzwsw9Ai3pKOHcJYIHEpR8XaZDCf/5LNpPlN5s4fw3gXDFLY7V PvO/cJi5DHE9YUEAkVv1hyKmJnb7xDInlYpqIE1w31y7Sr8hauQnhPKz/O2zWhOvGCld p73OYqKQ9fTdH1rk+kadOlpwncM72UBWTBPpcrePRWscYhNybwtxmHUThCzXwbbqoWk5 FB/w== X-Forwarded-Encrypted: i=1; AJvYcCXMxSnlcbyBjc7EabOs0I6T5s9d5wmsinmXH0QjtO9VHgwXN/PWmNUDNqk4OuHbWcy281nsM7suCg==@kvack.org X-Gm-Message-State: AOJu0YxZoswxfbzq0L0+7qYObAgVfBXbBxQ4N47rGfnLMe11+lAT3UgU GJPIG+FLkc6Y2w4MZHG7gewe4jubWwOE1b/gTWS2X7HiIrBipIxgGXBkh0ylNRs= X-Gm-Gg: ASbGncu0HMma87k7QrqT3MpDfurmjq0a+tJCUhgk1L1fHFbHydz9vG7WVerpuwSET6u Wuf+SBcOyeFwFFOx/9gHctC39N1t7t5SeCo+BmOezm4ishmInoCm4w9PmNQfBl3O4ypku3jtQtp V/oI8wzhnQpomDsc/dlAQhBzx/et7q9nRBTuIumoXfHSCuvxBF1EomRRh4mrF+Fpd2hnC+Xi0/z 0GPFopzlo0WI+D7cwSSGcro7tnfPJa9V5lLKD/S5atxzRDyzNVoqHf7/guFKNSLIvwTkq8E+2GS 9uA7T/EBR1OOI4VAe/FjGLWvvvpvVZMpBRg68girFY0GKZkZzkWYMd0= X-Google-Smtp-Source: AGHT+IFKPuh8cOHYjBgEoM7t8cHgv4gW4YpL9WqheJYopfOZX5sbWBiog25DM4bQ+IO4xPTW/pcKfQ== X-Received: by 2002:a05:6a00:14d1:b0:736:755b:8311 with SMTP id d2e1a72fcca58-736aaad1daamr15723454b3a.16.1741618374533; Mon, 10 Mar 2025 07:52:54 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:54 -0700 (PDT) From: Deepak Gupta <debug@rivosinc.com> Date: Mon, 10 Mar 2025 07:52:31 -0700 Subject: [PATCH v11 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: <20250310-v5_user_cfi_series-v11-9-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Queue-Id: B541720016 X-Rspamd-Server: rspam03 X-Stat-Signature: c6f95u5w9kq7gqfoiszmn7131kkdikxn X-HE-Tag: 1741618375-566157 X-HE-Meta: U2FsdGVkX1+BeFigTTfWveDQ2bewWXVRCqNmnFXh7TksDKgi83+iUyKZyxNN5QetHgsu7Rpxluwd1VTPiSW8cYRoMVeCwljWZzdyiy2EvIviD7AFRid+vsKJS1AGTZefeEieaVyYYOkj1ZdY9UHW0vOursQ41hmzUEXSmsVd8pCWD0dEMoUrNv0V+eV+IgDuGLwKAKLI86qUwzBTxQgCmaq1txE/4oGQ9nq6JPIxg6EOT2m95VHNXs7qqIN5GNyAvb64XO+vIHUB603o1iAlJRfvjgZuZf7rGiGjMM1JN00/qBI25CufR61w3rbiQSt0PviHUCPKORdMZfogfXxYUAyCoTtXmTYPaBu5ytCdv5y3LOq1aWEhdRQ5F+1loYj70GO0qlBJyqm0t8AaWe+/NqYARY905qup8tF71EMcUv8XPzX92GWdfpr1tIL3k3xzz/uGmaVkJX6WtF6Dq01u/cjQVMu0BPUOWE1VOPC98NYJhmya1auibFnOJ64I6hs1ZxE4HCaar++RhP3BphR1PrCnZe0kfhpH2o7IlFcx58M+QZaPNctuGTb5k0WENgApM1nXBqhoFjtgrySfcf4jQvWt8o0Z+KbpcNE7G5oQYdd73Z7m+q5KQd1iB8USghVuZD8byRTK4fcSl7VOi0Mjea9tpASpInsG8iBt/gbR8S3v7ql+RkwZpyHkoJCPLF69FiXqL6hZHZEb8gz7eeB978aG2AdPR59qGjWXXstYU2GFIMS0tJ7BqT9hE+vxZlCZQ3Ol5TAg9a8qapNViroBblFcZAqB5oEfpvDNQ9azOfSx6b9owEFbURALfXNFtTgjkRvXJbyrXfXh4FySAhE2zexwQaYfoapPQcadb1y+x3QJXvZF0ePKG+wltLxH5qrK4yQxgbsyL+6QZkMAy+RfggfhtBHWhbkHbBsc/Ji1GXuJgGgUinLGYRJkVMFZRxSiSckYXEkQXfiIe7GG928 48l22F8K UUc382ErenaUZqYvOETcmTCnJRM4mgWb8BHL/Q7WcUeEXV5+MlG/8QLH011tpCiRKpITJNgB7ZLK2kmzp7g/Xdlx8NqnFiGf9xtwrJa1CKlwdd6cgpkY436JFQt3Lh5YebazGiTwER3+dfcx7B3g76Duh71fMvFBQv7m3XJi5BcCu2xquU+tY3VeX/hF1utE22xUx0UASDPDobyl2eCZANGhv3ds4brVHAR/IlIDjxlO31miYDyNEyAn8NaJN8fdIHoErqLdOwsgGcarsycz1QSPigV8/DomvF1p9XeKLtOerXudC5iVUn24JGzx4vhY1uhVBOn4vt1x8Q3CLLrksYuYZLvyogJE2c9qGRiBR9ZzTtzs121Y46cd5XdflVEFf0TYtG/hU0IwCfRrljQCRxW4FETW+dX/WezM12XDGeIdtWQPdZd6dXFQcIoeIept/HwfZ/bfp+zM3A+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: <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