From mboxrd@z Thu Jan 1 00:00:00 1970 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 A20E3C83F1A for ; Fri, 11 Jul 2025 19:46:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 451836B00AD; Fri, 11 Jul 2025 15:46:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3DAB06B00AE; Fri, 11 Jul 2025 15:46:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27AC86B00AF; Fri, 11 Jul 2025 15:46:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 06D496B00AD for ; Fri, 11 Jul 2025 15:46:48 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CBBE112DDA1 for ; Fri, 11 Jul 2025 19:46:47 +0000 (UTC) X-FDA: 83653016454.10.FDE3E48 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf05.hostedemail.com (Postfix) with ESMTP id DF90B10000A for ; Fri, 11 Jul 2025 19:46:45 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ot0K8r0X; dmarc=none; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752263206; a=rsa-sha256; cv=none; b=x33mo+h7ZcwNJl3xQxipDi4a9DYDT4wevYUu4wwFhwo6SY8Kpsp9teosriSSzwfqrBbImL wcvhVreSfGsjrX/zvoMb/fnFYkwdu0l+2l4N8i7OmKlxCHs5kkznUoojc0cMgbf+nnxC6P 0BPnU6UtXXFffkyrh8dboj70p+fUEhw= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ot0K8r0X; dmarc=none; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752263205; 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=BDxI/yYSpi877MHHGVz9e95SZkFrsQJCFVNaVAxUNkQ=; b=2DNeYuzYlSuIeNz5fOSfNYdCZ/BlVY3kEpO6AFNqZoDHZMcPpHKwZbDITaYR6/bOpE0VBP ZSFJyrdgB6b7x9XNkF5qGe44IYV9+Dfzq2EjzA+ihPhn1LPNQBUaEEIXBjj47R1GYsdHJS gTk6+cPKkKr62Nie5pEhykd0jYBB1yY= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-748feca4a61so1590355b3a.3 for ; Fri, 11 Jul 2025 12:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1752263205; x=1752868005; 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=BDxI/yYSpi877MHHGVz9e95SZkFrsQJCFVNaVAxUNkQ=; b=ot0K8r0XCkINi8NI2h17XNi54dMKYn+FmCasL7jJe25Op5qRDJHH9MsXdn1UcBOniB zWmGFfejm7A5NHN0S2DqyGqwgpT7DB6xqn5p2/3gCu8Xe+pUtRJhoEFY4tVB7F8Fkvug +86qzim2fblIgHONQ4EKlktZ4rAqBnrNGQsEYAxohK6+G5KvxihCnRsECAGeFX349mAg ku9ZXJpJ4VJo6u9HBRUw99FiP4ezqRQixFbCIJ2qInuh3Qq+XHRAtDMqN4FjWctivNkD rYJ8yiSypMNeBUnAJRTRWggFzlsBElK7p67c188hDsAqAqgrYYHEycDprVVdaFeAhdbb n1yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752263205; x=1752868005; 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=BDxI/yYSpi877MHHGVz9e95SZkFrsQJCFVNaVAxUNkQ=; b=vJrnc/ZqHbV+FQlrqCGSnWYHjtyPEKY/fBZaHUkqox0EL/OOE3RPzMDPsBPROS075i WxDrk/bL5O5XVA1zBLvMebi1s1k7otSOSMSbj2Y7SJBC7otDaZayVv7An/bLi1mhAbFq krY7v9l4JfRWjO59zGQvQc9CCJyqSQHxF+gOwun+CkqLSdNtf7O0VL+8XePC1dXCfHqG LKmxQyHbOnsXNit7rCT9LlxdBHsIYtspNhKRelGpppSFtk2x0uC5YOQsx/FaRLIsL0Vm G4kwjHQ9JgO1RZtf5zthciT9ydrcgXpBc4wFCHsNEYjVnemwFyFAwZ3VskKf1kcqOoKc XVLw== X-Forwarded-Encrypted: i=1; AJvYcCUC+vqJH8OsN1jgzgsd4KMWNEciAbZlJQdHcXQIsXgCLEPMx9qKxIcBVt8jYA8t77UWQrSBbWOuBQ==@kvack.org X-Gm-Message-State: AOJu0YzhipYVd7Yx+4FgMEwMVXdGqvnNQM/m8M5CgbtuniwyjzEV0kSC 65rHwtxzKd6Uul8ynMlLV7eX3XQC13KdVLr2ayXcUwj7TNmZCN50MSA2rXi7RdDeN6Y= X-Gm-Gg: ASbGncsZd6Vrk8hu73NP6mLXQyyoedNDQ4J5JZZpE9z88E0N6v9tpGkejz7KduDYi8J gwbd8t77/2qh4lwThaOTWv3UaCo8JMRbPZ3hf9jlaf4eRdqFOFG2uqSnP/8QN6VOGkju8ND1mcG lmESEjN4/ym/R3TFQ4x3bAs+ODlHl4460KaR/huFM/B8M7PLhGTtz1pkttYjOQyyZihE4ujTu1A z3XVWhuHeauRNePFoCbgQcKmLen9C1+fxjr7sc1UOLF63nXOW9P8POeyoLAX99rvrX4fvZTidsv Wz4mtkDGKU0ogIg/0wdhAnNrntmhD7OM1Ggv5e2xhSZ/SC7dMBqxgxK7Kqy1+2ybkdOtpxIoxNM ASqvCj1UtwV94jMA4DaJLGm11ozEIVc9Q X-Google-Smtp-Source: AGHT+IGIeX6vrogslsUp9I5/3g6LtLtxgz/7WJewirl1yVEouzuNOdEUzly1G/0zyOnokakybjg18Q== X-Received: by 2002:a05:6a20:c6cd:b0:1f5:5a0b:4768 with SMTP id adf61e73a8af0-23136860063mr5873562637.21.1752263204646; Fri, 11 Jul 2025 12:46:44 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74eb9e06995sm5840977b3a.38.2025.07.11.12.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jul 2025 12:46:44 -0700 (PDT) From: Deepak Gupta Date: Fri, 11 Jul 2025 12:46:15 -0700 Subject: [PATCH v18 10/27] riscv/mm: Implement map_shadow_stack() syscall MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250711-v5_user_cfi_series-v18-10-a8ee62f9f38e@rivosinc.com> References: <20250711-v5_user_cfi_series-v18-0-a8ee62f9f38e@rivosinc.com> In-Reply-To: <20250711-v5_user_cfi_series-v18-0-a8ee62f9f38e@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Benno Lossin 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, rust-for-linux@vger.kernel.org, Zong Li , Deepak Gupta X-Mailer: b4 0.13.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: DF90B10000A X-Stat-Signature: yudbdhpo5edjcw6qfwsbqjhc65grpf7n X-Rspam-User: X-HE-Tag: 1752263205-193905 X-HE-Meta: U2FsdGVkX1/otLXXIJNL+r3CY4U+Zo+7mW99JE2TuX5Fg+nOO6Ru129bgP3uXFYjNuiMlPUpZJZZravj/7/EeckQYVPfsaX8WtX7hCQBbEuRv7JgWkhV9geOyE7qAIl/6BgydS/vrXfVwCcQ6A8Ajnm+sfU0uUpnkCRARdOuX7WGJ0CUCvcIBiCHCrlVQNPKNzQLpgcWmTgtxYtrlkaCavhRBDSnHOTXYlBv/GODnXX2igtlQNdJXAauk4cmeZ71eZS7Ux3QNee9OEPWMusEFCY9ZSQEmcGX9Modt2imNdko/aTz6XIcFiN3QMZp4LObKP8hGPk7TxJ+quzkoDNaiXdCa54jXIPkKSC8Lr24EGAICg3xZTg3ApB+AvL379qKFNUtmG77c1IudUPmIhYq0fgLp14kEWQ6PaLf9U0sNZNNDg2djR14nSCcm0PhcrAG1+CnEQDT3dYiMwJSfKxP8VTd8k5jcraWJ6XOr6c+o9qqY0QkzdaQpjrVu+fShqUGEi2qPvkesmVrmXiYBIEtPbwe+gmebGXr0JA3ZGfMszAXIZT6iOzx4xPd8y7ULKqetCWY6wHqBygFPctoQu3xUqmeYMy2Nvsw1GL/YJz/mGLe9I4MyxNErpccuWUiWQPYfRrPziuZKZrLASATe0sHL+xzbJdcxCUe4jrUnFRYkyPrVVI6HEtv9uErJgqsl2rrCGNGs6wdYpUnWN+a4MGUP6RmazrP8Yu+C4vMn0KR/N6urxzuKuifmMm0KffWFJ3vmk1buR5FBNpNZOR1155FcimtawqzeKZ9M8cZfJ9v7f2oTFjA14D91hakZsswsXC1IMDhrX1XnOpHUWE8ZrwBOmUiMnjAalPLYOLqQFGaKvA7/UoWQCVMSus2PxTsp8sHduPgtiwqIJRxh5VDqi4Vw2Vynrm0sHXlsJ1j5rbB/+02orsl0w1ygZuRA0hS1JElQy2OufeW3vpdu3JInCa tbnolIQK c3KLhnTCaNWeILEfU2PCjj424o2htMuBw7MwfBPIC4hr4RbM1TmurKMlS7cp3NjRrBd7hXRnYIR+nu2tQcB2I4CV+NWvBX3LwlOuUFF7Zu5FjGAqohWMbx06the4JL1ft9KrNhGHEvPERvDDmUCITkJm5qEaaa0EgrsBTJyjOUMKuPezCh7LhMG9GwkjVvdqrExgaza+5NL4DsI1VHIICE0HoGBiSpYVSxvK1enmI7Ix1X3+jaNnd3jV+uGOtchq/L6ESIZhEJ+m5y6EW4nTQ0gYgnfjG/372rFh29Lf2of46k1siiqc7QNk98Rhb5D48NrATFXm9qhRomqgLIp/Kg6kybhgfwvh77xh5Gj5BhOWuG3CjaMN3+/Np7pAT5tiv6mTw2F2uKf4RBA3OkZ+8kUi7qkjgNnx66Tnqr5510+FM9Xi9pHzVXxcXL/+2SMqbRuSolEoCY5NTm7zTLAJdW4dFSZciTuIDGY2M24GnwQmu5gK2uNWrtjmb4xIDqzj7SHQUXFRBlg+czTDzbfRz9k0D9JVuHENNks0rDPdIGSdbtweINf+ltnUu+XrBgqjR1XDc+3ihdqJVzBTAlBLXWSvgu85j/KnkDzu1 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: As discussed extensively in the changelog for the addition of this syscall on x86 ("x86/shstk: Introduce map_shadow_stack syscall") the existing mmap() and madvise() syscalls do not map entirely well onto the security requirements for shadow stack memory since they lead to windows where memory is allocated but not yet protected or stacks which are not properly and safely initialised. Instead a new syscall map_shadow_stack() has been defined which allocates and initialises a shadow stack page. This patch implements this syscall for riscv. riscv doesn't require token to be setup by kernel because user mode can do that by itself. However to provide compatibility and portability with other architectues, user mode can specify token set flag. Reviewed-by: Zong Li Signed-off-by: Deepak Gupta --- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/usercfi.c | 143 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+) diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index c7b542573407..0b245f36731e 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -125,3 +125,4 @@ obj-$(CONFIG_ACPI) += acpi.o obj-$(CONFIG_ACPI_NUMA) += acpi_numa.o obj-$(CONFIG_GENERIC_CPU_VULNERABILITIES) += bugs.o +obj-$(CONFIG_RISCV_USER_CFI) += usercfi.o diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c new file mode 100644 index 000000000000..0b3bbb41490a --- /dev/null +++ b/arch/riscv/kernel/usercfi.c @@ -0,0 +1,143 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2024 Rivos, Inc. + * Deepak Gupta + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define SHSTK_ENTRY_SIZE sizeof(void *) + +/* + * Writes on shadow stack can either be `sspush` or `ssamoswap`. `sspush` can happen + * implicitly on current shadow stack pointed to by CSR_SSP. `ssamoswap` takes pointer to + * shadow stack. To keep it simple, we plan to use `ssamoswap` to perform writes on shadow + * stack. + */ +static noinline unsigned long amo_user_shstk(unsigned long *addr, unsigned long val) +{ + /* + * Never expect -1 on shadow stack. Expect return addresses and zero + */ + unsigned long swap = -1; + + __enable_user_access(); + asm goto( + ".option push\n" + ".option arch, +zicfiss\n" + "1: ssamoswap.d %[swap], %[val], %[addr]\n" + _ASM_EXTABLE(1b, %l[fault]) + ".option pop\n" + : [swap] "=r" (swap), [addr] "+A" (*addr) + : [val] "r" (val) + : "memory" + : fault + ); + __disable_user_access(); + return swap; +fault: + __disable_user_access(); + return -1; +} + +/* + * Create a restore token on the shadow stack. A token is always XLEN wide + * and aligned to XLEN. + */ +static int create_rstor_token(unsigned long ssp, unsigned long *token_addr) +{ + unsigned long addr; + + /* Token must be aligned */ + if (!IS_ALIGNED(ssp, SHSTK_ENTRY_SIZE)) + return -EINVAL; + + /* On RISC-V we're constructing token to be function of address itself */ + addr = ssp - SHSTK_ENTRY_SIZE; + + if (amo_user_shstk((unsigned long __user *)addr, (unsigned long)ssp) == -1) + return -EFAULT; + + if (token_addr) + *token_addr = addr; + + return 0; +} + +static unsigned long allocate_shadow_stack(unsigned long addr, unsigned long size, + unsigned long token_offset, bool set_tok) +{ + int flags = MAP_ANONYMOUS | MAP_PRIVATE; + struct mm_struct *mm = current->mm; + unsigned long populate, tok_loc = 0; + + if (addr) + flags |= MAP_FIXED_NOREPLACE; + + mmap_write_lock(mm); + addr = do_mmap(NULL, addr, size, PROT_READ, flags, + VM_SHADOW_STACK | VM_WRITE, 0, &populate, NULL); + mmap_write_unlock(mm); + + if (!set_tok || IS_ERR_VALUE(addr)) + goto out; + + if (create_rstor_token(addr + token_offset, &tok_loc)) { + vm_munmap(addr, size); + return -EINVAL; + } + + addr = tok_loc; + +out: + return addr; +} + +SYSCALL_DEFINE3(map_shadow_stack, unsigned long, addr, unsigned long, size, unsigned int, flags) +{ + bool set_tok = flags & SHADOW_STACK_SET_TOKEN; + unsigned long aligned_size = 0; + + if (!cpu_supports_shadow_stack()) + return -EOPNOTSUPP; + + /* Anything other than set token should result in invalid param */ + if (flags & ~SHADOW_STACK_SET_TOKEN) + return -EINVAL; + + /* + * Unlike other architectures, on RISC-V, SSP pointer is held in CSR_SSP and is available + * CSR in all modes. CSR accesses are performed using 12bit index programmed in instruction + * itself. This provides static property on register programming and writes to CSR can't + * be unintentional from programmer's perspective. As long as programmer has guarded areas + * which perform writes to CSR_SSP properly, shadow stack pivoting is not possible. Since + * CSR_SSP is writeable by user mode, it itself can setup a shadow stack token subsequent + * to allocation. Although in order to provide portablity with other architecture (because + * `map_shadow_stack` is arch agnostic syscall), RISC-V will follow expectation of a token + * flag in flags and if provided in flags, setup a token at the base. + */ + + /* If there isn't space for a token */ + if (set_tok && size < SHSTK_ENTRY_SIZE) + return -ENOSPC; + + if (addr && (addr & (PAGE_SIZE - 1))) + return -EINVAL; + + aligned_size = PAGE_ALIGN(size); + if (aligned_size < size) + return -EOVERFLOW; + + return allocate_shadow_stack(addr, aligned_size, size, set_tok); +} -- 2.43.0