From mboxrd@z Thu Jan 1 00:00:00 1970 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 9A5B3C3DA6D for ; Fri, 23 May 2025 05:31:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 898726B00A6; Fri, 23 May 2025 01:31:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 848646B00A7; Fri, 23 May 2025 01:31:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C1FE6B00A8; Fri, 23 May 2025 01:31:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4BCA16B00A6 for ; Fri, 23 May 2025 01:31:56 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C0F4CBE1A4 for ; Fri, 23 May 2025 05:31:55 +0000 (UTC) X-FDA: 83473050990.09.1EDF0DB Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf08.hostedemail.com (Postfix) with ESMTP id C5EFF160004 for ; Fri, 23 May 2025 05:31:53 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=AoeNY73G; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.170 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=1747978313; 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=kAP36O6BU8F9DPrpB68y1EW9dwWbq9r1wcSyP6fe6ws=; b=zCTUFlgVmDw/QHWWobdgJs31rfm3uj0WVxGsI/ZFfGuahqMJj86p3wgqoXPkdu9USC864b YbcBh7BJz0z0MQW+M611qV1hy4lkgH7+bgyTMua8v5VveSdQOnYwgVoeqrWIlqgrCoAfZu 3y9EzgAsvZknvEm0ajo2DyP0Y4qUqfg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747978313; a=rsa-sha256; cv=none; b=PeYoR9TJ6ng261F39ILFkA+WiBXwQQ6Qr2ocHgIXnUqcCCllDcjK82ld0PQe5O0zHXXBS5 wiLfeEus1Eb9tBWLVqE7t4CK65/qgRtDCdfZsUgD1kTnhs0xW3iVtbBmkqF6GVaygxIqxe Ddj0dRPYEOSHR6nJ5S22p1U7yJlEdNg= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=AoeNY73G; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-742b0840d98so5219749b3a.1 for ; Thu, 22 May 2025 22:31:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1747978313; x=1748583113; 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=kAP36O6BU8F9DPrpB68y1EW9dwWbq9r1wcSyP6fe6ws=; b=AoeNY73GFneFpbfGDUSnQaqR31z3GBjT0Z10jw6/V7m2QhP60NGPKhbEEXEOMQSTP3 az+wWW+r3NVlw6kogVQjX1DUmw8agS3CFaV1S1Jn+b13P6+aTSOEWFMn5xt7hc4EYARs jRCvfKV6gl8B9BhUGidX0WXYDwVEkLcpO8kr46AnLzg+Y5CVApa0FTaWKGERn06J3/Im Wfv0iIgVsJLFFx+gzctJa1+6u8NGnnw6kzKOIIkdqlSV3U2r+kFG1lC4vjpgDvMNqMYS ZFU1EnWipRNX0faXwpLQZ2AyrHqGcM/L9C/mlayHNulJne21MiPxvpy0/GQyBjL3sGau V/fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747978313; x=1748583113; 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=kAP36O6BU8F9DPrpB68y1EW9dwWbq9r1wcSyP6fe6ws=; b=Y/8vVX8JAC2jqwT4zBG/NpXTDczFc0TAPE37uQp7h1ieU6pH2AY0j7NvJgZJ23mnm6 h2gOr/8D8/v5cPTzJIXHvduDIHgjUs3iE1faczQHJx3jDS1ESa69MbGQHW2W3aSxCfql hy7N1regeVos765OxhhYyQYi7ADiQI/yzl0WV2GF04EMOdrT+7QE94fr0X6QLTQ7Mcti PN7JKF3N1m99Xv3l/i+iZfrpeTyH5L2vWhbpmC5sCRi47uqUheGLJteFGuHstGxCqdnD jo7Xpq0uZ3zmhNENAYPWDMrDRjv7XCBCBQZ0T72wjhVLR2gyAjKmogM7ydWcEN+1p3nl Ew4Q== X-Forwarded-Encrypted: i=1; AJvYcCW10ZXS6b95prydy6OVQdhSvVuPTO8x94PRijnUOFSTikTzajBHdGM+fle54se+PGG/bQj+rbjdTA==@kvack.org X-Gm-Message-State: AOJu0Yyry/c5wOYBUcxavC6KVBz0vv0FYDQWhwpZ/NKAHz0lxS7lKhzF UBw/+02Qf2tEWvFMUIxt4Z+fbqqrQx7wiyLn0Pm2WBcmPJ0jwRHj0iXjodrRb7JKFwp4g0qByF9 he6wf X-Gm-Gg: ASbGncvKQixq2zFySlEgPpkhov69qZB6yVxKSKCiyy1zSZQg5wHUOGx2xx1SGgOvlr7 8cVQc0MCEhlJuWocaJxO2xAmrvlZm1KWoZoUMCys4ysw/BBAmGzbP8cI6znQcAPl3G2jT7qAV4U HVftYnMGLBOz7620SG8UyklKa6OrdmP9Y1ubZzvJWxgY5+vQ7tMY295A0bDZteYHn2rHnaQAbzH pIdDKn5ZcdfilLs2n9xsd9JPegaunUN2i/fcZcJv5/WlTPvy18SXFfi8Mp07g+8+oaVnTTb4HrA 1Atc7bX6yQ4dKxvGlOVVLk9WQYjDPmBH+g6AH+aE1EOtocFVfJmxpLoGjwMwRWsxuYFyjlc1 X-Google-Smtp-Source: AGHT+IG/frD50LLCsvbIrlD2jSPxh93OKt57M4X/B5I6SUB8JpNmYlw+536CX4BdNo2P+aa2d078pw== X-Received: by 2002:a05:6a20:7287:b0:201:85f4:ad07 with SMTP id adf61e73a8af0-2170ce19ebbmr38410458637.33.1747978312596; Thu, 22 May 2025 22:31:52 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a982a0a4sm12474336b3a.101.2025.05.22.22.31.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 22:31:52 -0700 (PDT) From: Deepak Gupta Date: Thu, 22 May 2025 22:31:15 -0700 Subject: [PATCH v16 12/27] riscv: Implements arch agnostic shadow stack prctls MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250522-v5_user_cfi_series-v16-12-64f61a35eee7@rivosinc.com> References: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@rivosinc.com> In-Reply-To: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@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 , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross 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, rust-for-linux@vger.kernel.org, Zong Li , Deepak Gupta X-Mailer: b4 0.13.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: C5EFF160004 X-Stat-Signature: krhxcmmozs9im43iui7d5mg8bfi166go X-Rspam-User: X-HE-Tag: 1747978313-262247 X-HE-Meta: U2FsdGVkX19i3oeXkjc2T7Tqmu7T/laBouMKRkip8NGV59tDZsd1l2YzUSOS1/41x2c6uKqzgb73Db7bX9mGt07eKnL6dWSEsQmSTC37O38xy7dNfqq0xDUaIb6CrUWAHpBkg5cUKt7ataSdNfNuYYuMpij2yoBSLcq+d9UOEGhrX4TIhuqCCYc3EjZPrPhEMChKTkksHSTQNc9PMPv/woo//a/ftpPMhIFm5JDlNG2hPajzC3X1XGYeCm0/AsX1MsqLvsApamZ3fAWTxA8PBSNJxwFwl5UGNSxB6EABtamwyekNcjNhiwQzqXsXnxZj0G7Y6wCOSHXKAIEEqFb/JiHpReBMHPqsA3d93ghTs22nZcgJbjgRysBBp1dSN1nJAb2Gr8Ub3gM+tveMKEBFIcXnviilKtJVksl4UaouOl20/TcEjpYPKKbgDUiWcTG2yln61HzpxS88rPsFB3Cn7OnnvX9U9waB3I7h1h5tlHJYFMKP50f1H5VulOfgMAzAwdGjWT8zQFSS3ff8U0cb9GzPlT92jSop8SCIQZ2Z3FPuDkc3+FBu0gyRe5jC0NYTqxpCkCD7uiuG9tV4+gVJz9fu20zo9iXX9UA+u3NU3BX6jZxKeIwIpngbYXXMq5if8T3QFr0kYKyRykotOGSHizxFwLwZGy5v7DbnhFLEtlJRMiimz8+mXPgdo/D1KQUBMvggtv0Q1XQ9ZkGyawjnHr1u4UXQ0KCR/yg7GvTPmonFfO+bkBtqMsyrO7inTAaCE5EpO2F2kyRXBSMDLboE85IXB00jLKFmoMRBNqtT6lshc0tIH5E2fhsyVmCnLA056mrPq2sSFe7rp6i9fW8b/9WkUBLfy2OKopfHliwL5UmSPNLrlYUOInQ7+UppxChuDJJl1pMr0FRRhNYJ36GDDVfI5y9B4GcbChcbomoCC/FwdfE+Bby9x2wbAn+wRIxTZuLlNjSChmc+BgjXYXF i2AxdNGz Du9fb/DWmIaPJS89R2lb4EEQqm6A4K7aJhuirMio0tlmJq/kffWzhAU5kM60wZYipHm5LVMrW6mJXw5r/GvZLNfvRoCLhJRyo2TE3Fih+eYBFIaHN8xZsI9nVBF5+sdD8G8L1Uot3gsfMRqbLInuc/oWKGrspw6VOJeFszuhe9LuV0ppSQodte/KGo3l6lJG7i0YQ7IQCtGxUMExrq9T2PCy2CzKfuxgeyS+/1uwW+xUJU4VtcDHSsI14H0uNMpxwF/gKCdL2po2D6r0LBq94zZQCvP37gmp7gnh4h8P/neosMiCUQcvAVWIV7Iawud1aP8m7jZfTTNochjKdfLFxJHgwWK3bN9j/M2Cs9Ac62YgtwHSYe9NtV98LeH59h47I565TmiLwuCELR9mj/ODZklCIzOJ2550LYrTp1IkBdH+Y6qPLmg1fS0NLr3iAbqfiKdGBDedZ+/vsWAvAQQjaIs6dIPA/MY0CQhvyqICec26WO2wR3pqwRI6BmDa3ZiiEtz5aJTWXhfdRfgM= 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. Reviewed-by: Zong Li Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/usercfi.h | 16 ++++++ arch/riscv/kernel/process.c | 8 +++ arch/riscv/kernel/usercfi.c | 110 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+) diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index 0581587490c2..b530ff5baa6e 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,6 +15,7 @@ struct kernel_clone_args; #ifdef CONFIG_RISCV_USER_CFI struct cfi_state { unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ + unsigned long ubcfi_locked : 1; 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 */ @@ -26,6 +28,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 @@ -41,6 +49,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 ec3d78efd6f3..08620bdae696 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; } +bool is_shstk_allocated(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.shdw_stk_base; +} + +bool is_shstk_locked(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ubcfi_locked; +} + 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,26 @@ 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) +{ + if (!cpu_supports_shadow_stack()) + return; + + 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 @@ -261,3 +291,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; +} -- 2.43.0