From patchwork Thu Jan 25 06:21:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13530085 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 64B8CC47258 for ; Thu, 25 Jan 2024 06:29:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E77918D0006; Thu, 25 Jan 2024 01:29:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E005B8D0001; Thu, 25 Jan 2024 01:29:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C03B78D0006; Thu, 25 Jan 2024 01:29:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id ADB398D0001 for ; Thu, 25 Jan 2024 01:29:55 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 81051A0791 for ; Thu, 25 Jan 2024 06:29:55 +0000 (UTC) X-FDA: 81716857950.06.5FF26AE Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf10.hostedemail.com (Postfix) with ESMTP id AA7ADC0017 for ; Thu, 25 Jan 2024 06:29:53 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=zj7J2CmE; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.181 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=1706164193; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=t1B3LjRC8FPiusELMKgJyB91QjKz3YM9voAFk/nY+UE=; b=nMsmkS1sO30d06WnY67wng3Q8A82t2fPYl2C2+b7RYD7HVhSSkaS7WQVpGbbEMGQnhbKY3 pl5r+kNrhERDT3Wj964tewfHozicHclBHzyDwaoczX53b8xay748897vMHWNPl2+sAi9t+ nBpoYZrqqIeDqayAcPRBSLmagq4tajM= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=zj7J2CmE; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706164193; a=rsa-sha256; cv=none; b=8X12UFEfxa2lg/ogKiG5BWva+asa2+I40w68OkCj19ee6RKq/uWu3BelGvUx0h6JNeNHg0 auxtjo2I1U0bVCuwB6GosQyld0Nwd5mUj1lSQuCw0Pw07AhIp5ne0+wrL5MnAbNXJ/+wrk k8KU3qBcf3II41c/BYHTo7xdLsRPqYQ= Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-6da4a923b1bso4575498b3a.2 for ; Wed, 24 Jan 2024 22:29:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1706164192; x=1706768992; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t1B3LjRC8FPiusELMKgJyB91QjKz3YM9voAFk/nY+UE=; b=zj7J2CmECQsW+dT/abTDJLvoSqf2fcPXMqJOrqJ/D9jHLsiORAvvKz8jWfIygSsgRD Iyih3MocjtztIqMfNmzvB/wKjONqSwcBaKhVLUPHD/7hG2yPcfztLQaVUuwxzTqjIUSG 2rWMaUL8QV0wwp7zlYQ7mj6HodTt8N7LEpUxQmM8TKpU/BE+LiMz7atMrXWQinb08FqY S4y3iMAC5lEA0bsP6W25LNEvgAgw5gLEC8S1SBaCKpjottUtYN8cG9LgQRmZ1wDNEuBl lDt1TaR0SJgZp83CYSWAFRIDJMJbEi8ekxQjzpXfDnDXVVcVyBD9FHDvuNKPhFoMPWZR H9Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706164192; x=1706768992; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t1B3LjRC8FPiusELMKgJyB91QjKz3YM9voAFk/nY+UE=; b=M+WoY1Za5LY/BVK3gwJfdvfY9EnQf7jpoPdM5RaMF7HdtJLv6L9DOLCgp2v/ZOJMrl CfSWKJ21hZl+KPaq9JkXUYVk7v95WUoJrBx/vEbiSdDCqOTsz6o4jEkkLKIYcZ9BQ7gX gruCs/+8i41SGHijsGmBIuQGOk/Pk31Rn38ekFj92MOjnmIuYPim8RBiU72WsXteJFK5 F/vNcl/CXePgruGOMO78/rwOfmlOMZmApTU/2O7CvpG9Zf2GFluBo0Hm7cMkgGEPJREm 8ln5UznVj6x1MfqLOnMf4sZvNkHSQNK0w1vwTqn4NTm3xOODY9JcKhJw9wC8OovVY0PL cqbw== X-Gm-Message-State: AOJu0Yw8qqNvZ8PhWooUl1m7Qe2G5FTd+PsF84t8SEKa/ca3LC8TKHbr SKnZjvXX3agKjhQLWfD/hlBFoSauNJ1YDmeQyzde59Fi5tqY5cV2aL7wWHkFwpU= X-Google-Smtp-Source: AGHT+IFe3XrkFPRdJ2UiIXYbbLc9t81EIm21drknEbRwnjfGJo5iR2n8OKkxXCB/AeScwGUu+RiNSA== X-Received: by 2002:aa7:99cd:0:b0:6dd:c3fd:45fb with SMTP id v13-20020aa799cd000000b006ddc3fd45fbmr215232pfi.24.1706164192388; Wed, 24 Jan 2024 22:29:52 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id t19-20020a056a00139300b006dd870b51b8sm3201139pfg.126.2024.01.24.22.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 22:29:52 -0800 (PST) From: debug@rivosinc.com To: rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, kito.cheng@sifive.com, keescook@chromium.org, ajones@ventanamicro.com, paul.walmsley@sifive.com, palmer@dabbelt.com, conor.dooley@microchip.com, cleger@rivosinc.com, atishp@atishpatra.org, alex@ghiti.fr, bjorn@rivosinc.com, alexghiti@rivosinc.com Cc: corbet@lwn.net, aou@eecs.berkeley.edu, oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, shuah@kernel.org, brauner@kernel.org, debug@rivosinc.com, guoren@kernel.org, samitolvanen@google.com, evan@rivosinc.com, xiao.w.wang@intel.com, apatel@ventanamicro.com, mchitale@ventanamicro.com, waylingii@gmail.com, greentime.hu@sifive.com, heiko@sntech.de, jszhang@kernel.org, shikemeng@huaweicloud.com, david@redhat.com, charlie@rivosinc.com, panqinglin2020@iscas.ac.cn, willy@infradead.org, vincent.chen@sifive.com, andy.chiu@sifive.com, gerg@kernel.org, jeeheng.sia@starfivetech.com, mason.huo@starfivetech.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bhe@redhat.com, chenjiahao16@huawei.com, ruscur@russell.cc, bgray@linux.ibm.com, alx@kernel.org, baruch@tkos.co.il, zhangqing@loongson.cn, catalin.marinas@arm.com, revest@chromium.org, josh@joshtriplett.org, joey.gouly@arm.com, shr@devkernel.io, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [RFC PATCH v1 15/28] riscv/mm: Implement map_shadow_stack() syscall Date: Wed, 24 Jan 2024 22:21:40 -0800 Message-ID: <20240125062739.1339782-16-debug@rivosinc.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240125062739.1339782-1-debug@rivosinc.com> References: <20240125062739.1339782-1-debug@rivosinc.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: AA7ADC0017 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: hwpw19m13d8nobjt3es6m963opwjojrm X-HE-Tag: 1706164193-241199 X-HE-Meta: U2FsdGVkX18dLmBtZpgj9dm7/CxXeaz86GlSDmTqo+dcxej2wLb9NsQdX4+LehTmp+gORc/LrjRljjBX+mqOajuqAUiK4rEHirEl7NjM3pdh/Odla/MfSe+df8UkLnjgpxtX9BcgNZgL+wrUqVjmdavC3IONhFnQEQvxmcqIr1KtHQoYDyLVIYWLVqWjg2OHsw4cZqAIC8A7xi6WOzj2/WyxlJZQtgqeXNDfHBvwtcA7VydorZBIOTN1nzlj19BNOzDMTi9bdTNBemf4VjtqoqRuvIn5KQM+0/gjR8AdSh852DhLfpSEW53VDoPHSfYKj1N08TskgmgvdWZgIVCEZovA2JbNvNse9uwQBaMcP+8Ta+Ea6EQ8Z7S0dASvEW3+tuB5Xh646ffxJhYBm+9qe7jzVk/9qfV0eHNzfKpeQ9pv2mJhbOB12oNC37/YRL8c1HvKm93tZQRoo8TNUPZub3QrNxtAtWVrDTB0V61E5pqSmEfB5wFpqFullH2CEuveefctjH8ZTYoT2fgVFRmMOtrAYXBDKsoihq2WKkJXUvdQfwA0hG96ZzlooN2ApvOFtJOH/uDbiPXaiegrWurMVWNDr0FwXCVdsNDIEFdK5oLnZaQXfLaxb6U6PN7jRXcjzGOE70dKaZ5l4mW0AnHN6lfjuv3RtTzqhKNIWneKo890A/GAvLxfs6emUqZfUJBJyCKUo3QYi6aHqwZAlJi0pnyjwjFRphMhf+khlEYY+4uX1MxXXiB374fpUQgBmNaUZPaIb8yzotNC57kmTT7oHvCr/yg+zjtodKHj1TJvs6JZmPNxkU3tmHql/6ED5E6PKry4RRYVOljbCbasbypoddju2ml06rwouVmT1H60AsnHhsHLyIMVxcoq89Mk2IxNo/MxDtWOUYpvQ8FFo0WNswUrzfzDvujd7IGUb+o3nToa+C3R5iZEEvDQs6aSkwh5O4qG8nSI44WqXaE9A/D izRfX589 Zu0OH7eTq+nFGaJ/oWzpHCKxHFWw4kx4fZua14fe/iH/lSgHLhLnDW95TiGxODrNRnDfMHOY3QLkNKxJ5uL+1Rt6oqRof1Xw00HmXIpn/lwDnmsADvx8ciwGEzSZE6XmHstQkXtHsXgHFYRJSXHAFI++RqjXcNHUakt1umkwSCxZTMztiISytOEZhudOwrtyi1vSt6EsjnXp+E7kYmc/tWYOE2iKoJCtd7Al52/5fehA3c7H0iO/ZH/s/EMt3n28iradvSoDv49VIYbzw2lwEzFvZfHtb8TdD80bd4mBuAoqeMJAeKTytnUGzcVkdANJSPOJqeF1e2OhXPKHiPe32HYuUaj0staRlwiVhhvpFl99HXDia9V6IRYrQ0j+ZGf/1PHu5oynNafqWl/Fs8HrvX3xzPEXK2qbfV1ZmZrhzvndUM+ro44RSGtII0U1PwB2guXYHO0B7z7ESVouPM60FmOwl5ro1foapYeY7ysDCdfT7gP4gVClHWX4sOw== 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: From: Deepak Gupta 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 guarded control stacks 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 compatiblity and portability with other architectues, user mode can specify token set flag. Signed-off-by: Deepak Gupta --- arch/riscv/kernel/Makefile | 2 + arch/riscv/kernel/usercfi.c | 150 ++++++++++++++++++++++++++++++++ include/uapi/asm-generic/mman.h | 1 + 3 files changed, 153 insertions(+) create mode 100644 arch/riscv/kernel/usercfi.c diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index fee22a3d1b53..8c668269e886 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -102,3 +102,5 @@ obj-$(CONFIG_COMPAT) += compat_vdso/ obj-$(CONFIG_64BIT) += pi/ obj-$(CONFIG_ACPI) += acpi.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..35ede2cbc05b --- /dev/null +++ b/arch/riscv/kernel/usercfi.c @@ -0,0 +1,150 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2023 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) +{ + /* + * In case ssamoswap faults, return -1. + * Never expect -1 on shadow stack. Expect return addresses and zero + */ + unsigned long swap = -1; + + __enable_user_access(); + asm_volatile_goto( + ".option push\n" + ".option arch, +zicfiss\n" +#ifdef CONFIG_64BIT + "1: ssamoswap.d %0, %2, %1\n" +#else + "1: ssamoswap.w %0, %2, %1\n" +#endif + _ASM_EXTABLE(1b, %l[fault]) + RISCV_ACQUIRE_BARRIER + ".option pop\n" + : "=r" (swap), "+A" (*addr) + : "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_SHADOWSTACK, flags, + VM_SHADOW_STACK, 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)) + return -EINVAL; + + aligned_size = PAGE_ALIGN(size); + if (aligned_size < size) + return -EOVERFLOW; + + return allocate_shadow_stack(addr, aligned_size, size, set_tok); +} diff --git a/include/uapi/asm-generic/mman.h b/include/uapi/asm-generic/mman.h index 57e8195d0b53..0c0ac6214de6 100644 --- a/include/uapi/asm-generic/mman.h +++ b/include/uapi/asm-generic/mman.h @@ -19,4 +19,5 @@ #define MCL_FUTURE 2 /* lock all future mappings */ #define MCL_ONFAULT 4 /* lock all pages that are faulted in */ +#define SHADOW_STACK_SET_TOKEN (1ULL << 0) /* Set up a restore token in the shadow stack */ #endif /* __ASM_GENERIC_MMAN_H */