From patchwork Fri Mar 14 21:39:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017497 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 C6EB4C28B30 for ; Fri, 14 Mar 2025 21:39:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63C5228001A; Fri, 14 Mar 2025 17:39:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5BC47280017; Fri, 14 Mar 2025 17:39:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 398E728001A; Fri, 14 Mar 2025 17:39:55 -0400 (EDT) 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 10B89280017 for ; Fri, 14 Mar 2025 17:39:55 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3B6021A1551 for ; Fri, 14 Mar 2025 21:39:56 +0000 (UTC) X-FDA: 83221474392.23.13176C1 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf23.hostedemail.com (Postfix) with ESMTP id 52656140009 for ; Fri, 14 Mar 2025 21:39:54 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=nquHllbh; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 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=1741988394; 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=ZL2v/gS+0+DF34n+ZrnHt0WiY6OgvVWONOJtZHYCX1s=; b=Aw8X9y7rLR8FKwtDGcXgFBFCU4tIHonooWEDoa0QVybgXqOHCiFehs9TQ/+Eezo9UU36Nf /kSaoxpz06IUclBsadWfPa5nPGVI/bKUweJYG4g0J6qIvAg57qXJQp57hvF0SZU8fb8hbx 9xW/Ini1YgUofnLLT/qP3M9j7XRCe20= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=nquHllbh; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988394; a=rsa-sha256; cv=none; b=WQyphwS77+a+FZiFoSEiSVo2924x0z1oVPUwcm5lDtmhcQrSdtFwiQVUvFf22sn0eIxYdq mlfQ9ZFoEeADx3Lou3BP9FF4+d1jvE73wI7wdf2FJ+MASwMMo4jNvZ3R3S2w/ghnlu6y5s hyCYqcxWLPWDwY6XKtrMUeI9dzmQKjU= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22423adf751so41791695ad.2 for ; Fri, 14 Mar 2025 14:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988393; x=1742593193; 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=ZL2v/gS+0+DF34n+ZrnHt0WiY6OgvVWONOJtZHYCX1s=; b=nquHllbhbOa4gT0WdijsuMrSjKNojXz4cI1X3I/H/tpenjwMutraY5WMXtcJ4i0lYE giIhz73yAndPTXYZBqzHQ3nFE/LonIuUExWZC77k/aEX4F/e/Ta4MV1OsZDBdVTh8SiZ /uIp2S46EulGY8jFDiI8HDrWzGJ6o0ct2g3PRoc3OYSU6GtVOVW0F3G6nZzRfJYrz6yW zc+NbWrDtej7Wo+R2FRpxeVGc4v7KFSfbcG/uJJ3zblhFHOuvlP6VCmj2/bmQlBf1rRp Ia5HHvNgiiMimv4JbhONk0b8YRve2TffNJdMfacqK+1KaRxpBQfKjhcMDcal0Sj2G3Y7 9VGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988393; x=1742593193; 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=ZL2v/gS+0+DF34n+ZrnHt0WiY6OgvVWONOJtZHYCX1s=; b=Gb/cjqnpJzaGsN7PdlX5cDVRn8REPf1aEcbsQMDjjhgBI7zhrriQ0sbgLXIDxlmvdp AOW5YgFTqgFXKieJ3bBhXVl86m+Ny90XbynlDWoaoxqbH8rJWHGuDM7aaGvYpuiXdOd/ KRUpvRH95dLP2otp1riZwHsm9tlQjbB0nMVvPlHzcjsomGp65JkuD6Jc3tmHVK+YLvhN dLaC1+iLsnMULoXuC7BM3rm0A4LwWRhSrG8KS28KhGdWNyYHZueQUsfwNU7KpeFLrMmT uid960UghVpTc5mYokSNj1J6tbCpEAAeRd+dxlwVekY/3ZWRmTrCfkvd+v3zo/A55cYY zffw== X-Forwarded-Encrypted: i=1; AJvYcCV2TZ28UUw4OduGG2AB+cJmiTnjQ2SXt7I6R4JJ107qaeED2GtOHeHK2ZlyZiWu/wZcvpH9LHdjDw==@kvack.org X-Gm-Message-State: AOJu0YxLRzQZtrOCrlD/3sqXlo2GLtbDw8WY1wwa9VsiEjzg5XMaBn1/ isuAwoPlYROwnVjUgYPiHX6sWY3UdYa3dt3iHFHKahBR8stiTF1PrFhn8Qzdptc= X-Gm-Gg: ASbGncvDgN21FIJdxz5OUKhBWOu7kjx1GW8NE2L1TikXv3v+6geGBoeh99RgeNlviz6 SkOrm1wL3pU5bNsFm2tTp0UKhbQZ0D4B4r85CKxLbQZEihbi9hL3ZVK/+zsHD2dtBqcNff8RBCq x4TeeQyJuGsROMhrVmY3l3LQhV1DGKhBRQ9g06fet6hspimlSywjjirqjAukJXCpX15XV4JKCy/ S0l0gNjOsHApzkx6I0/LiMYqIIIOqYE16Wfo7G0BmIAf/N739HDZaXuTeDHC7U6jOMy2TI8bhjQ LZNKxJl10gr0kmZ2KttHtBni4rnKERKsvrw7ZF8oao/VD4rQ1HCEhWI= X-Google-Smtp-Source: AGHT+IExiBLi5afxFVIy1qmyPdBKTHq7Fhk/9edJe1Uyl1tqXfGvVFk/2MK6lH2iHYAUQvjSyaVdrQ== X-Received: by 2002:a17:902:d4cb:b0:223:402b:cce2 with SMTP id d9443c01a7336-225e0aeefcdmr42109185ad.33.1741988393228; Fri, 14 Mar 2025 14:39:53 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:52 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:29 -0700 Subject: [PATCH v12 10/28] riscv/mm: Implement map_shadow_stack() syscall MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-10-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@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, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 52656140009 X-Stat-Signature: 6rmcnq4y3mm8ex4up61qm77pm6sj8bba X-HE-Tag: 1741988394-537044 X-HE-Meta: U2FsdGVkX18CKwJH/Xu1mMn5YiPqFxPTxTzuGZQOfln56/7P7i8Rm3bVT/PsXuzlh6pFKYPIIzktcWSHEwm8gBzzB7p+bWK64jxCWTwJiYeQV5HZuaqB+nS6gIszHhWYC4stC0G+3Ae1gDUNpn1mUQYWOpvlSjPol8HwoGxbaNNhu2RxU2+S6Wgb1Fnmqmf8PmD1FtnWzx+S2aEjjjC/j9IUvsUtdeOR84B8sdZn2CWbS3hvPbHSriOOvwsBlewVuNorBRuDt0nFnEJ7sYs5f8bPQdND/OzPcpgY23AmfWZ0yW/8W7k0prEkfJalqAJ9rMRiedE7KHmyRjVqLO/UxwQCifqua/RWo+beJBaty/wGMFVLUAy75WBJ8r4RXgcAen0M6HSJ4BdoJfuHq72XObkEgjbAI9YtoMAjtpEHsYIOS/RN0qhF/81R4eO66G8Y9hKPD5OClOzY84oDhsQGI9Px6kLysh+vEAy2EXWm3bepfFvlwPU98uAg0ddLet+VfyjaHfA5hs/vU4w50F/khcakmhcoQ3YLiO6qYkx67vu1tjPJSKSH8Mwo2B7B8ipe1XVMo0t54Y0s4pE330+JUOGxEUAQUekhIQfvYRDXUGLNVgNUCCvE+WJeDmD3pxqCrHwp0SfMKmLMMMZaFsHC82uPbG49yK7IrLpJc/EeOq5AT8Tf2A8lk4M6g/dTKyDm7f05EK8P/ANokgqM747OBXmabhZzMejUOeSZklfRqlJqY4CIWE/Ox9btYI2cgJEc9apQZslnwLMd1uUeOjoSDiGUUhsZHGXFtNXISVMdHEzZ2z6Oc8DekvDIkfrYjfMHlEeasTvQ8aiuuJyQRpuhuDU9puXiJio5WwXLVV5bHdkik6nRWkyEPHT92oWLzHMkwOoo7+3iInlWjzb0lGuiZETsFXHlzswn+dPNWYHOTnrB477kO6dJ+ROtvF4RtCuwpFkDbDtZZ1cfxsG7EuC Wjh7k410 SP9KlTrSmFy6WodEoJ+0oUhkWrGQPxTQViQ1dRdma9MEF3jj1VQs25Yp2uwNTeJO6SayYUP4SYT4RbqRy7tlm0EebonxQZuxKvBZQ6InRDF4rDseXP43hRQK6Aygjaph4nxnpnPf5USJIDgV3hNRWmAJ8vW7g6zFaPcECI48CwwTEkvzU0P0P5AD/vyWfEiJmMnnR0GuiFrqxsmvPGNHy32GtvVX22t5+sbtIpaLI70KVpYwtQ0cfeglvIZ29SdV/uQWxKNFGht9YzYk1xkqc0wbY3SESMG/xS6nANy7Oze5WGviqTBEI00SqmK5MPafB9TvV2e1BBPRXbU5mK0pHGkjqOl/srnHrcq9IWntFvl0HdhUs+TuBlF5+DKgwe71sugOqohQ3Z/aeaHY6C5c1d4923IligFJcihuVkZsGy3iUtrpNrVl8O6pcsrGXNst2EWSg1pL/VUnXzYKrKb2EXtFJcJGOcWLX9RzdNeinvp9p/V46fqZ6XaW59qeugHz0zPXqthUFXNMqRevigeFGpOKmLnYYqZ/54sqKjKp/11JZKfz6oKRiA8A8eLr1D3FN/Nga 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 | 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); +}