From patchwork Wed Feb 5 01:21:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960371 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 3D912C02194 for ; Wed, 5 Feb 2025 01:22:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CAF1C280001; Tue, 4 Feb 2025 20:22:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C3963280015; Tue, 4 Feb 2025 20:22:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A86AC280001; Tue, 4 Feb 2025 20:22:16 -0500 (EST) 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 8064E280015 for ; Tue, 4 Feb 2025 20:22:16 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 374C647ADE for ; Wed, 5 Feb 2025 01:22:16 +0000 (UTC) X-FDA: 83084140272.13.765AEA4 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf16.hostedemail.com (Postfix) with ESMTP id 4AB32180003 for ; Wed, 5 Feb 2025 01:22:14 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=dqPGQEWr; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.42 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=1738718534; 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=hK7DlmuIRYzIsuvvXHgsbKnv3WN7JKJpEt1D7vAnJaQ=; b=XV8xTcsVcqAMqYxRNMJuNznj33Rzq/m113i90mNzXUIyirWQiL+C7H93uB/dEaOdR8SgYk 07BIj4hd2ETHEi2FkA0wH3XZwMRelHX2Z61AN3kwnoKcHo/yb0jZQTIHu7psq6L6iLCukB g6HFLPGPEoSZSDcLpNGvZwFIvRnLOng= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=dqPGQEWr; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718534; a=rsa-sha256; cv=none; b=nGCU+oWC1IGorTd/G34YrZAqRqZsAvmkVhREhabY4QHLVYp+cRH8Yixd7Vp4qONfDuHTum L5JLGSla5jBuNQdRtY/Ci8iRHr/OD4mC70UgpKVth8yqL4YpH3Fzd4gZpxybK2rezwei03 rmou6LIJTRc+ckrRylcUq7200xembkQ= Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2f9c97af32eso1664822a91.2 for ; Tue, 04 Feb 2025 17:22:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718533; x=1739323333; 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=hK7DlmuIRYzIsuvvXHgsbKnv3WN7JKJpEt1D7vAnJaQ=; b=dqPGQEWrcOnRXGhSDnKrrEoINATeZ8zMNZRDSj3iK9473YgGRnPO2E4Vzq9lXwshvI gqxdyNkakLM6rwFNZpaojIKqv2Nf2UeF6KEkWqdrBo8+KONSq172TcAXqYWYY4Z+ugpu hbQgcrZTsHaIhkVYVyd+Z32B6fz29WqMbZUOrfVaz1GJNIzDNCVXaPmrzwa94IdQ0NKR 8nXUDkOO/Pzwkifb/N/XTk+EgHQpfT1VHYGv0ljYEeKXJB/gFf5R+JQfi6imZotrpD4D PxsrzEw1GJJQ5hc34WNSGNiqWunKQtnO3nSaLKEdGTPTVIvaTtXTtT/LA0tPLYm1ORrY fLWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718533; x=1739323333; 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=hK7DlmuIRYzIsuvvXHgsbKnv3WN7JKJpEt1D7vAnJaQ=; b=rjxbRWO/WaRJMeTbKyC8wlOw5uXVg/YtSIxnhtN/A79Rb8MpS+OSORA0/vjC8E2la/ ldCKjZHNCcUzSjgDEZYkPI4/R2yoF/zygHZNnodE1Xm43xHBwe8AfCqEzpcIJqOgpmZP ueihN4pVQej2VEZjmspyZPPhlkFkdRL6L6oVi5BhmlFWQWgwyz6HDFNZVCMz4C+BC4f4 tS8VrhyhpRLjo+29LEDIuF6x8qLQRZF2y/l7YLL7nF3lvjtV/lnR7Gnt3z8YQnG/bRtw +Vh0BOHtZWO9inUZu2tNR2Bt7HEmwOVJPMQH1ihOA3WQ1ORYI+fNlMcVMW9uN5KKFdu1 NBVg== X-Forwarded-Encrypted: i=1; AJvYcCUDQBadgdqBknM5UdLi3QzRDrnhPfhA8/q7MFTZpRA4HfIpW4oFIB312dKHJyQF7JmUhIJTgOu8Ng==@kvack.org X-Gm-Message-State: AOJu0YyX8fRNczAbUPjbquO0/peRyiYf8e7OPhiSQO2iJtOZpHnSN3SC THpq6zcOGFIrpjHWUSyaYZ0s3DYt1+b1Wor/NNq3vmPyUeePRFGfOLYl8tme7a4= X-Gm-Gg: ASbGncuV1s7RUQxjX4HNJJ5Ok8Bye6fnjPav1llAo28JGfvWhyaxYOVJxfSrR0mFsmT ebAfW2mF5GK1OS0bwU5SZjcKsVQZ7M7bYqGAQvCevqtM5GNhlUWLSx3tcyBrGZ8IL9aL7oYaak9 bRMoAiiu2YDRLq5kVTwaYaiZ52mVhpnT0k8n7ZPMZ31HZ9sDGqa2/aKtAxY8WECuLGCzLUAbCvR axO5DKJgi9piqcVHD4ZcJ2AfqUmsobTu0uj3etqDuTiUlvzB8G5KxSIwRaEVOalqiDYkoBbLen0 q05qDOar5a6qm85HIsj8QiVdzg== X-Google-Smtp-Source: AGHT+IHSDstT0FGTL1rKn5OYVTictI2F7hNGUqzMma/U3VqWcjoJawW9HqWn0ZJ0B/nhVBR5FKHupQ== X-Received: by 2002:a05:6a00:1d88:b0:72f:d7ce:4ff8 with SMTP id d2e1a72fcca58-7303520d315mr1572427b3a.22.1738718533123; Tue, 04 Feb 2025 17:22:13 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69cec0fsm11457202b3a.137.2025.02.04.17.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:12 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:57 -0800 Subject: [PATCH v9 10/26] riscv/mm: Implement map_shadow_stack() syscall MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-10-b37a49c5205c@rivosinc.com> References: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@rivosinc.com> In-Reply-To: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@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 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 X-Mailer: b4 0.14.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4AB32180003 X-Stat-Signature: 5q9zt58p81umycxd13mnpcw5tt6ywcxa X-Rspam-User: X-HE-Tag: 1738718534-714574 X-HE-Meta: U2FsdGVkX1/UbTnruHy1TA/vXadub2aGxCBLlqbgdqeFXChopZ17Emj0Ff9bd15sleua2fYifCg3IjcoyVYpEhoEfS5ME3WpV95CklhBapSTgOvHYZdo/eZsVZMZbTBWcC0LdW9+p6hY7Sf/TSXZuhfsmOlyuEZ2gjlSkEY06GVrO8nK/v3McOZK9C99GOml7y6pvnvsgvgQlHyI4dC+rdCBY8yK1z2BDVofFW+czeHImwGU/0HPrxvmQFoowI3axrYxVic2F154WFMPK+DSDtEy9QsXyLwusEdNggOGAFO+592Ts226R+QvVwwVduVDUW7/bSobkk0pOEXPq+1tkGRZcgib1bkTWa3DCSqLDzWB3+s6n2XnTQtTqhsaefv9eNdowek6nW5hiqP48Bcx4DisQxS1q19qgwNKJ22j+4NlXVGEu1yNkgYe3dEKHRnBBYP1RhYGKhef8rncNLqkvTk+qv5F2s2lbrAqaMBXPzKVQ6Ag4h5asO5QNhn159U03o9y3r3+Z3p2Kfe8xGKxR1yMDiSvHwFzqd7VN7nwqIU8SSVDxgxN8Yjy5GTI8kw/ohpRRwFUYo1WK+6J9i3Xu4F809dheAnuqOnvsz+uUerVU0FrpopM8/TM/lV9EdM82EiQbSEwsuti6HBBMPeCZgK5nMQV7cN2VAlHh31fw414JPMocEn8a/UyGkT4/SCOlSdpmrb6h69VQdsWduUTBd9GzLENWU+89zcG7v5yf9iRCEjh3ReMUnyI5EqGBPd0dzr0hOglh3Kuf3FVQiswsJGOG/rcgucHLTbvIOo6ed4cz3ckzPykkrHdT6zbeytL2s85l7lcxnvzNa9Rlafei5FNXihbIosTWGB0VK3daa7rnVdLg1YRYKgT+/Npcxt0p0i4jKA2RycDbNGr9koQGKTozD2TuxkEg6EfHC2RRAnIbhE7sRIiNwzpCyYXBwcAxvLrNS6Ypa8uXO1Q3bj DUrtoLHH hKJvaFOR913gV4H89KBoyNP2ca2FuyUrW6SIgGEV5H7MtDoFTDiE6knYDXVtVqzCegpumoh9O9LCsO4JjxmqdaBJMzCdieZI4nlk5a3J1t7bWGrChgiJGOmXevYObSejaXpkibCesy5l/OzwytuGT1jNrgLFYz1q6srG7ntrRJpPYSpMm+p3shKSJDRV7hKpGkysHv/ha/Bi2EzvEu9typVjdN1WkxLFggjAfnjFwBEDQCUwMDbcdTRMued0EJUD6JzKvm5aL+yVWRz4krkbTNvYkgvViG/ZCnpEFRs9evAlJzWqVDITbLuS8+NS82k+qd5pmHJxYZC1FX8+Ff5gEDrnGteGE0TG1gVcTDlhbtM0ryELmk9EfpChQr40vystGuZ0Pv2ondTVDgywgdLd5o9h8Ph3jhYW6GNyVU10CYLGyUUj/Aq+YEPypRZwTYkKIAFhXJGG9gJcmgoR6gTwk+WP0ZSXKE7T+SNsWS7jLUw+muuLKK1D9KamTAQ9uWEAPUePz 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. Signed-off-by: Deepak Gupta --- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/usercfi.c | 144 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 8d186bfced45..3a861d320654 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..24022809a7b5 --- /dev/null +++ b/arch/riscv/kernel/usercfi.c @@ -0,0 +1,144 @@ +// 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]) + RISCV_ACQUIRE_BARRIER + ".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); +}