From patchwork Mon Feb 10 20:26:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968605 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 621ECC02198 for ; Mon, 10 Feb 2025 20:27:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB74028001A; Mon, 10 Feb 2025 15:27:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E6FDA28001B; Mon, 10 Feb 2025 15:27:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDE5F28001A; Mon, 10 Feb 2025 15:27:11 -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 ABD84280016 for ; Mon, 10 Feb 2025 15:27:11 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EE072B054B for ; Mon, 10 Feb 2025 20:27:09 +0000 (UTC) X-FDA: 83105169378.10.B8B7D27 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf15.hostedemail.com (Postfix) with ESMTP id 06D23A0003 for ; Mon, 10 Feb 2025 20:27:07 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=3Z7NxoWY; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219228; a=rsa-sha256; cv=none; b=6u8v9CRYOxbkS7RpR79OsmL7vpp8gh15U8nq0S7bX3IS5klGo//d20aQTuzAaS6updSZ6C KKpdRcyjVBJcKCf/JpvQT+MpgSuo5UxBUJCjg42YqoVzBauKqjEGr7zazT0iYPlUpFBqrQ lNA4LU+65MhYgodDxTJeuzo07vKXKyk= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=3Z7NxoWY; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 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=1739219228; 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=JRBf04F1CUY7LtDAg0yCt7/cCixL1Ju/LXf5NSa9DtKYnfOLILOw/CbC6/+DYBD/xP5Icp XNEWA2SniDpkmIiQfJ1bHX03JpaGIHjJXR/L+9sMV7vccinQI9W9Ctnpk99ccQPNR8njty rtc3g5Wjo+e1YponyQwIIxgjROjZs1o= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21f0444b478so68622235ad.0 for ; Mon, 10 Feb 2025 12:27:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219227; x=1739824027; 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=3Z7NxoWYLPmCbOJXUXBpCwOwEv+99H/p2kr75p0Z2C6LcanH+0g2zk+dmbKsOr70fO 6ZDIdeF106g7xCg1hey4xhJLBOqLf5KlmRKaHv4fSVqM4WUW1SXKG5C7zLbNWM3E4YET cN2Ep7NlMo053uLuO+GvGuiozBd8r8losGzCxB6pE7ORuJmOMJ81zyjCY2oKio8h5ho+ VfstrM4vnzhN2e247MzTVr+5lVW6eje4sKuzaY4j0BIyC3Hb12EvOQ8a09OJHxuOY3rZ rN7OACQp36d9/s0Isx8cTeMNkwefYROUcZnRNpOM5GnUCeewQMgx26undcsSHq9gYPjU QaGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219227; x=1739824027; 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=YhmsoNgaLHDGlYX4YiLy6LROXOWqBb7D/Xd6fSe/rSprKIC3o9QTuitwOrit+zFaTk tpZwiy81v+U1sDLpTkKAZKXI3aj/6z9cvCezJGdhs39eIAx5CKIJERQwsKZ2Mamx+unU QBd1iyrqQ+ocE5iCPDQgreYRmrlp7iyjLvykYRecs3aTst//1YZyV2rvU5lnnqIdiaJs C9cCINmN/JQnwvSzc6U3vU0bQCc3E2xgZXmUF2TqX0pTDlQDoIM80kFFtk4GpT3lERNo nmFgmr3jlGuLo4V1vl5OKH5LNkJ+pyodvHdU2lCXaSdB1LbSDVwPj/jTk9LZ+Zhdbi1b TqLQ== X-Forwarded-Encrypted: i=1; AJvYcCXcOiXyp1/cVR5ZQJR/+Y0wmgVlSPZx0SjB4k1XljM7QdXmKYd7QUy9swLqG7Cwuni6JQ1l5K1DOQ==@kvack.org X-Gm-Message-State: AOJu0YxrcwEo+xQEukuWxXFuGkFDfeipnllvMOkO5GGqfU9BO5epPk1R ikrWFyafdAZYAyFejSTyawHyCoGJP/iZngwbxFH1b56mvtU+1/tBbOUypw+W2L8= X-Gm-Gg: ASbGncvJU5FxBS0AnwCd3DnmCl9pC3AbZ+RV1PF5Ch+68XygkmB3LhUEjhr1gMHYaCh 5q5lsjF/OWZh5ge5I42svcX/DjgYuLmhCYrq6UeFWYaVCyB9yS67wcJZ4VPZKnsQF+GaNjZcp/I Gq5dLR5drwzGuDO06xw31wC4eOPShI/elen6vig7V7EVs7uGN3fc+81yFkCw9s6mxybgJ0+mtXL h7xuBto/XRfPXkg1WS1EmzNJIIhhCNmIKGrDHjEStyD1paT26l9z36dL6kFgSxHDXyV0QAIA4zZ 3tf4LCD506ltMbk8Uxa1xooiQg== X-Google-Smtp-Source: AGHT+IFiFOkgExdj3mQCqaaai4pDSiQ+Hqrea6eAygrZlJssTNgeNQJJiOpmwE+Z7PNIOmAr6Vu5+A== X-Received: by 2002:a17:902:ebc3:b0:216:2f9d:32c with SMTP id d9443c01a7336-21f4e7a1ffbmr262362135ad.53.1739219226925; Mon, 10 Feb 2025 12:27:06 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:06 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:43 -0800 Subject: [PATCH v10 10/27] riscv/mm: Implement map_shadow_stack() syscall MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-10-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 , 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-Stat-Signature: 3i3y5a9w416hqcqh6ydzpaub7ukx513a X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 06D23A0003 X-Rspam-User: X-HE-Tag: 1739219227-234248 X-HE-Meta: U2FsdGVkX1+oRRpPzd/h2Qlz95rNa7KdQt8YcGVgwYPEbo1x3pcMgKzB8x7zQUxAeyIW1sIHs1gIAuzG7G2Fieya/ksjQa5g+66kFyUc8GbAMyQy3lWid6lBe3uNYW5qKblwI4G1SZ9r6hsD+jhg4lQVb4zZtLSfP1ijDrR05HBrgY+wksV+A40aSqVjA0b/AGHm9Yx2Wd1HygKeNcvCOB/Sn/Hw1utZSp+dU9GrBRy0z8Sq9F4eVCyDT+YjNeIqC7sdsekX9YpTtPglwxOgxoCug5MazABu/NUnnHtE+iSqMrVraoH1lNs3yuwnKK0qKBOT075DVLY4o/X9LuOy3PXkv10zfKBvR0IaRncKGGqpKCTWi+jRspSuSMx50bqRFCu16r0jsNjWdsfzyYFjkInVKD0k7vw9FXm3IYzzwTuiJMyHb1FZUmwEzDUVO+AeT3LYlV3w3J7JmkDPye9vMeaaYiG8OivuZhzOfrkzxd+9xLFnozJsX6ef8bJUx72uKgyAY49PIbePYfFxBKIXD3Y+HAn5JdqL2Dkv2s5ATUmfEfeNFpeMcOT1q58EYYByWJnuXGSoEOFWEz0as3LTXLwspceRSjNC73WCpjO4xNSmiBqkLcLdhrz6/tiTigoxoKdjNk2xi2I1aLd6zUIAXororbVVmRrkN55Jj4vFX74NRBmJD3jAeyzdoMRxtkAc+H+4MwGQYxgB3oki4+Ne/WkzIneSWfrV0SmPB8ZOW+J95uiTQR+TbaPIYhx0Kw+Jg0YVthvihhsROeHoqiwoOqj/qIhGvyxKElHGfQh4e6Sp1ymhQr/SYGmhxLL3c5bX2OXOpmF8HhPYD1qLL7uf2L1RVOfteCI4mACXty0RW07ytSuGLvuJaWgQtFqfK4cQTh1zCDh9l2VbZb22dt+iBVnnmMeSMkuPFmmijwuLQ9c+ro9Nek19TaPxJZwbLs+x0uafconPdhVWIIed+Ax BUfN/4c2 PKtBIwERbY+7GN0Kleqxy9zn/2pqjhWxLoqEn+noMU4zGSaARw5qw5BEdAPUBQQcKzIqYG/TLgViQWa/fRri0AhPJyiKZIkcYSDqQZponhMAICk6Q0oPwWKdp4gJGl3d3SAO1ianPBUTHMN+5XP67ydAYUi4WxknjS8ZAAP+lZwPTdlG9jRGXm0yhfQJYyjx2ufX7Y+/z94E7688JTu9LRCBw1BOf5V9vU9RmUMhALhSrrEM6745EBCMh2atxDburXf2CKKoOeoSp3lNjFWwLRZbxStQvwtSKTvbc1AMRhtxQwS0yXThKrimPrz+8qQFOmtA9qYVqzTPahZaMCGX2nyoWy6OGrMLUJbdOdSx97jYqQwaBuqBl8JIU1BWlZ3KaUfwWuPKRfKMPUbMz5uC6vQsNFjryU1RRHaF5oQig+o/DEIMdeVpLDcqbS9WjAPH1TvRahSLy78yFq1jIOa2dlshU9Qn8YM5VbK29zVeOnVn+RombrMhxcvSTEBUnTtydwEqD 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); +}