From patchwork Mon Mar 10 14:52:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010201 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 060D6C282DE for ; Mon, 10 Mar 2025 14:53:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DA00280001; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 48A93280011; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2B579280001; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EBBA2280011 for ; Mon, 10 Mar 2025 10:53:04 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 12FA21CAEB0 for ; Mon, 10 Mar 2025 14:53:05 +0000 (UTC) X-FDA: 83205933930.24.7D31D28 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf19.hostedemail.com (Postfix) with ESMTP id 0A4811A0020 for ; Mon, 10 Mar 2025 14:53:02 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=srNz7gTs; dmarc=none; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 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=1741618383; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=V95qthVswfHxsMZlpH9QUUk2yPwBtl/SK7gM178EMBwWvtUNOfng+WGB/rbEDruPoB3J8W wMHabk9mZXKax5wJ+tguoJNxK+sgkxmYcxCoPAf0i5NqMcBYLqxNaYQlz3lHaQNStfRRdS C3Iwrn/tLp4B0K/h/e4WKQwsXsxpaSs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618383; a=rsa-sha256; cv=none; b=ODD1yZlQwza9gpWltQWF7T6F9YgEdYsfQRZSFrxiH1fGcVWx2lEhRZS9SCUr4qRBT0x2DT AWsoE8p+lyLCl6o9LnkVzqU+hSPs16yGL5isO4WozsoP0PNcGNHVhlkIrCVaai2csI9pbs 6RMMfLo1rkwuK/JAiCoLZnRyhuOQfFQ= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=srNz7gTs; dmarc=none; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22548a28d0cso11724685ad.3 for ; Mon, 10 Mar 2025 07:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618382; x=1742223182; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=srNz7gTsBeAddjEONaPHIJn7b5/ugTrIkxK1e1DYzxa0kjBLbPpa9cpRfxTYB7dD1X Im0hSEU5KUWUQHyJldSzooGWqKlgBcIXJkaYlDR/UG7Qco0QTU6GeQVknsfqD6dOeCdZ bbuOsJgejzR1W9Ja7OE1gKs2jgR47BDlDyJYWzSZm3HjgJDoFzJb3Vfeb307pejmo6TH D2+0GEnVTdaNplutwuk0DOsJMYID/4Me9n0NE7sTjddMe9eTVFan7gpevwQzWFQJE5fD sNfd2u8WEMQnf7Aq+ysI5xfo9oTiquYBl0kCuL69SDcQFpAA46KjwIp0RwyEI1JXsE04 FnOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618382; x=1742223182; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=binw0tuEYp1c6FoueLd6B1UVjuh53MUlr5/NBMlt3LTJ3884v5xuRICQNResKB8PyT OrY6aPqMbY9n+panGdFxVkn3lo4uRR2WbKHNI71gGFxdEGEN/WtUWXT8rzvq+ryG2Pjk qzufxuV1wFwTpV7qz1nf6FF5ZQ+R4NI0TBTJH4nNk2Yn3Bx1uNwat4w+adHrv7m2PNWK zfE1LcB+7iPSr2R16My8RSNjo7zRghKJzycsHNAFWZkCJHVm4mB9WEHPfLxJWGgzIX+f itnP7GYHdmX55dVno+NtbK31EcBkplgqPlGGMZ6kwJMZlD+UlKjJMg32hTVpiGr4hR4D D98Q== X-Forwarded-Encrypted: i=1; AJvYcCWk3f8Xne6MyitlNU9D74iSKhkR/xlDeJK+kJ2vG5EYMUex0mj6s+bAxhETcTM44JmJzDcDXBI0pw==@kvack.org X-Gm-Message-State: AOJu0YzfdFRc1zPj3T1I3PmMlO1QaoHu63qyWmcIMBtdW0AY5P1G339Y HLdn1mVEJSbqm9f8bIAuU93PcB5uMMHJh7c3+Mi8uapDYKNFVd2dj6xy2QL9K9I= X-Gm-Gg: ASbGncvOaZb+2vx5URvPheB2by94zYRTbdyAZIq56hdHANPzdeMn09pR/gYOifXJShA 1u+6xpCIQxiXDVwHfk598X3j+h+S6vYzj8EGD7Bu5+Epo8+48n3sVbbsDKbPy4c286V2VyMurj2 SS/RSOmXdMkL4FD6b8fBXtK7QmbQrgtUfyVVnymMu5s5EKLFN5kFO0y1bY7dHxB/4D33GXh4QfH Oz92DvIGJXyCt4192yZXrzcpa423EVdDBZ1j23VPqPb4I4YIAwkHE1/nSqyHxp1YLMYI7xf+fG4 hl25K6S6rD83PLpfj8PAG99zfszdNC+pBtAroJ1j3NDiYBxI95GrQlQ6RBm7cjF2+w== X-Google-Smtp-Source: AGHT+IHCKzm+H1WuyN4ioLJbIhvG1jyYj+k1eB31ZxZlrJTUkTC6vhrDB22oVaHxl5JQ/hZbQyLd3A== X-Received: by 2002:a05:6a20:430a:b0:1f0:e893:409f with SMTP id adf61e73a8af0-1f544b180dbmr23325177637.23.1741618381901; Mon, 10 Mar 2025 07:53:01 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:01 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:34 -0700 Subject: [PATCH v11 12/27] riscv: Implements arch agnostic shadow stack prctls MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-12-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: 0A4811A0020 X-Rspamd-Server: rspam08 X-Stat-Signature: osgxk5scudd5o9ahm19rmmrj865uy8c7 X-HE-Tag: 1741618382-982601 X-HE-Meta: U2FsdGVkX19863j0dew/INh+IkIOidRvBe75Y7m+qn2wxXxQBTVKQwWsahZHY7gN0qwK3vbMagbdWo+l07M5n+dNK7ZaerLAxJKO451dG9kZhwceBZQgJzrtIGEIHqNWK7kmm5X+++n6TRzTdE/Or9pobTHG1LFrRX1Um09QBbMbWZMZRPTDH82FSxOQGb3/AfUCRpNosRbBNCPDiN/SN3sxyOCAArJd9e/RTcX9iMMQ+Lcrh2u3WXx8g4MV/QgLOVhGkkOzHdzBTYEbjYHZPQp2KrkDx0P1KWmx1oqIP9DwgXTMfrzHDEfqinhxPkHgXNdz7lJE21ztHPqp73Ch79syEpHfLT+LlnM46zvsnih7M1gGce+PxRxvoxWHR5VzCWgbbPbKArJ5KQaDINNT6Wdm8oXti7/1YGp1mfWU+ZwpkSsd4qxOZcHMPZoqe4mIee57st+R73V7sdtpwjoTmiLSeMlKdGCHIx14+xFZDkxtJUB3Mk7forFli1g0ymTyogLXikiNMm26btYsWuzJ9HSUUJ8xGjZML2LyFRN9UDAwWzDxUkGQ368Bz/pkSgOyslhsvwzUt8bhzSP5OZFDZvxJGcJd0bpBhuTMo+2zKfdmgrEs+xDkxGn67sL+jiKBzGGL+REiaE93taklpF+AfOJqS2uMOaRRBoQLTPoP/fG5sEweUTaGpGDUvbvcjMQDRDQcAGsyABWtIR611Zdlu9pSVAJatdETumj9X6J/MZFT6RLtCIusqQ0S2fUbO9f07vODDSeD1YGOND9jOYrqqNPjpXDZqqktYDXrGssl4BzusXBXTA2Y5nP4fLiYilVeiS9PKyMurTrCi1fV6Leb8FgHB/kouzood/6NI4F2MM2xxa4t8xGz+6chVWK88362KuGX1yK/ZF+ZJa3DZ6fyGi+60WCM31CUqh5df7mbYkn+NaykneZyeDzryqu6w9yjnuDGSvSRkWhzmDpe4Bx YCOCSBkd 6ChpAsT4eajyQ5fKXtTXFgbiEiVBMk2RCyLPKKiPoJwHjLPjyfTmWf0L02+k7/IjhPoGq7v9pbVLRsM9Kr/A2nHLIgmA1GXd5GzAmfqft/PGQJJD+T/3Fjr2r4e6yulrT6tU7e4MLh+0NoCBrxIbWkZ/B66ZuXH6eWj0oyHWEyV2OIEFpnFlpq061dN2akPRuq67aM8NQth/lGeCFq9GuAAfp4a73yzzIvzTz7uzaM15E1cuNuKWUjJ0GmzGcnWyJ7bElUv5L7tPHSrDWn30EdRD9xN7CrCNLRLd2Q8zb8pUbnB2S6o/sK50JgfAL3j0vxSRP2nEQi2vcii9aB9ECBIpZxos4xpVH/iX/QeLMLO8QRR6TU75A1A7faIAJCICgR/czAT4TpKkI3gA7c0gIPMhwQlBjL7EjSazniN65yrvotW6MfpkZt1w01Oy0WXZ0PS78a9IoR4yR1cI= 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: Implement architecture agnostic prctls() interface for setting and getting shadow stack status. prctls implemented are PR_GET_SHADOW_STACK_STATUS, PR_SET_SHADOW_STACK_STATUS and PR_LOCK_SHADOW_STACK_STATUS. As part of PR_SET_SHADOW_STACK_STATUS/PR_GET_SHADOW_STACK_STATUS, only PR_SHADOW_STACK_ENABLE is implemented because RISCV allows each mode to write to their own shadow stack using `sspush` or `ssamoswap`. PR_LOCK_SHADOW_STACK_STATUS locks current configuration of shadow stack enabling. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/usercfi.h | 18 ++++++- arch/riscv/kernel/process.c | 8 +++ arch/riscv/kernel/usercfi.c | 107 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index 82d28ac98d76..c4dcd256f19a 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -7,6 +7,7 @@ #ifndef __ASSEMBLY__ #include +#include struct task_struct; struct kernel_clone_args; @@ -14,7 +15,8 @@ struct kernel_clone_args; #ifdef CONFIG_RISCV_USER_CFI struct cfi_status { unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ - unsigned long rsvd : ((sizeof(unsigned long) * 8) - 1); + unsigned long ubcfi_locked : 1; + unsigned long rsvd : ((sizeof(unsigned long) * 8) - 2); unsigned long user_shdw_stk; /* Current user shadow stack pointer */ unsigned long shdw_stk_base; /* Base address of shadow stack */ unsigned long shdw_stk_size; /* size of shadow stack */ @@ -27,6 +29,12 @@ void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned unsigned long get_shstk_base(struct task_struct *task, unsigned long *size); void set_active_shstk(struct task_struct *task, unsigned long shstk_addr); bool is_shstk_enabled(struct task_struct *task); +bool is_shstk_locked(struct task_struct *task); +bool is_shstk_allocated(struct task_struct *task); +void set_shstk_lock(struct task_struct *task); +void set_shstk_status(struct task_struct *task, bool enable); + +#define PR_SHADOW_STACK_SUPPORTED_STATUS_MASK (PR_SHADOW_STACK_ENABLE) #else @@ -42,6 +50,14 @@ bool is_shstk_enabled(struct task_struct *task); #define is_shstk_enabled(task) false +#define is_shstk_locked(task) false + +#define is_shstk_allocated(task) false + +#define set_shstk_lock(task) + +#define set_shstk_status(task, enable) + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 99acb6342a37..cd11667593fe 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -153,6 +153,14 @@ void start_thread(struct pt_regs *regs, unsigned long pc, regs->epc = pc; regs->sp = sp; + /* + * clear shadow stack state on exec. + * libc will set it later via prctl. + */ + set_shstk_status(current, false); + set_shstk_base(current, 0, 0); + set_active_shstk(current, 0); + #ifdef CONFIG_64BIT regs->status &= ~SR_UXL; diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 73cf87dab186..37d6fb8144e7 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -24,6 +24,16 @@ bool is_shstk_enabled(struct task_struct *task) return task->thread_info.user_cfi_state.ubcfi_en ? true : false; } +bool is_shstk_allocated(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.shdw_stk_base ? true : false; +} + +bool is_shstk_locked(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ubcfi_locked ? true : false; +} + void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned long size) { task->thread_info.user_cfi_state.shdw_stk_base = shstk_addr; @@ -42,6 +52,23 @@ void set_active_shstk(struct task_struct *task, unsigned long shstk_addr) task->thread_info.user_cfi_state.user_shdw_stk = shstk_addr; } +void set_shstk_status(struct task_struct *task, bool enable) +{ + task->thread_info.user_cfi_state.ubcfi_en = enable ? 1 : 0; + + if (enable) + task->thread.envcfg |= ENVCFG_SSE; + else + task->thread.envcfg &= ~ENVCFG_SSE; + + csr_write(CSR_ENVCFG, task->thread.envcfg); +} + +void set_shstk_lock(struct task_struct *task) +{ + task->thread_info.user_cfi_state.ubcfi_locked = 1; +} + /* * If size is 0, then to be compatible with regular stack we want it to be as big as * regular stack. Else PAGE_ALIGN it and return back @@ -262,3 +289,83 @@ void shstk_release(struct task_struct *tsk) vm_munmap(base, size); set_shstk_base(tsk, 0, 0); } + +int arch_get_shadow_stack_status(struct task_struct *t, unsigned long __user *status) +{ + unsigned long bcfi_status = 0; + + if (!cpu_supports_shadow_stack()) + return -EINVAL; + + /* this means shadow stack is enabled on the task */ + bcfi_status |= (is_shstk_enabled(t) ? PR_SHADOW_STACK_ENABLE : 0); + + return copy_to_user(status, &bcfi_status, sizeof(bcfi_status)) ? -EFAULT : 0; +} + +int arch_set_shadow_stack_status(struct task_struct *t, unsigned long status) +{ + unsigned long size = 0, addr = 0; + bool enable_shstk = false; + + if (!cpu_supports_shadow_stack()) + return -EINVAL; + + /* Reject unknown flags */ + if (status & ~PR_SHADOW_STACK_SUPPORTED_STATUS_MASK) + return -EINVAL; + + /* bcfi status is locked and further can't be modified by user */ + if (is_shstk_locked(t)) + return -EINVAL; + + enable_shstk = status & PR_SHADOW_STACK_ENABLE; + /* Request is to enable shadow stack and shadow stack is not enabled already */ + if (enable_shstk && !is_shstk_enabled(t)) { + /* shadow stack was allocated and enable request again + * no need to support such usecase and return EINVAL. + */ + if (is_shstk_allocated(t)) + return -EINVAL; + + size = calc_shstk_size(0); + addr = allocate_shadow_stack(0, size, 0, false); + if (IS_ERR_VALUE(addr)) + return -ENOMEM; + set_shstk_base(t, addr, size); + set_active_shstk(t, addr + size); + } + + /* + * If a request to disable shadow stack happens, let's go ahead and release it + * Although, if CLONE_VFORKed child did this, then in that case we will end up + * not releasing the shadow stack (because it might be needed in parent). Although + * we will disable it for VFORKed child. And if VFORKed child tries to enable again + * then in that case, it'll get entirely new shadow stack because following condition + * are true + * - shadow stack was not enabled for vforked child + * - shadow stack base was anyways pointing to 0 + * This shouldn't be a big issue because we want parent to have availability of shadow + * stack whenever VFORKed child releases resources via exit or exec but at the same + * time we want VFORKed child to break away and establish new shadow stack if it desires + * + */ + if (!enable_shstk) + shstk_release(t); + + set_shstk_status(t, enable_shstk); + return 0; +} + +int arch_lock_shadow_stack_status(struct task_struct *task, + unsigned long arg) +{ + /* If shtstk not supported or not enabled on task, nothing to lock here */ + if (!cpu_supports_shadow_stack() || + !is_shstk_enabled(task) || arg != 0) + return -EINVAL; + + set_shstk_lock(task); + + return 0; +}