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 EC108C3ABA9 for ; Wed, 30 Apr 2025 00:24:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3AAF86B0095; Tue, 29 Apr 2025 20:24:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 306B06B0096; Tue, 29 Apr 2025 20:24:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10E116B0098; Tue, 29 Apr 2025 20:24:28 -0400 (EDT) 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 CAF6F6B0095 for ; Tue, 29 Apr 2025 20:24:27 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 49D7D1A155D for ; Wed, 30 Apr 2025 00:17:07 +0000 (UTC) X-FDA: 83388795294.10.11E8A9F Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf06.hostedemail.com (Postfix) with ESMTP id 58743180003 for ; Wed, 30 Apr 2025 00:17:05 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=njren62m; dmarc=none; spf=pass (imf06.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 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=1745972225; 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=6jHu/OMat6DJCezumIrQgwTdE4EYqTFBAPLSNzpfhJoK3RCz+TaDuNqLidJuo00fVymH/I SPwY7LyB+D5M+bu8GuwDtr+IuiU+mqU7W6206or/28ahghP7TYrbNq4I42XyajvmDdbfv3 w7jwukpfOERj2m6V4Vdl3ghHx8kbKG0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745972225; a=rsa-sha256; cv=none; b=2zzBbmfdoBSKmlZCOiIH8bvWesHpl6TZqks0ddemFmnyg6QXNGfcAAzyOMBoBqMWpUK6WG u5qgJ9VWpGQQ96JYGHNRaBsVDzdem15mfkajcB3r8+kHRtgCqHdQ0ADcc5t8NaRd/5lJ/h rpu4cl7bncFKtGBPkt0esXuE/iX0vOw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=njren62m; dmarc=none; spf=pass (imf06.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22da3b26532so57357375ad.0 for ; Tue, 29 Apr 2025 17:17:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745972224; x=1746577024; 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=njren62mrojB2djU+vlDVhpTAweB5S891WVKzpWXDef+hzVgozA5sswZHti0QtwkCJ Scs7S6liMDjkjeW+tXeKgtCi7I3Dde0pFQxHvsQLwEyUJodt8HBjmi0tNPbC1WV5i7Nc /fme7S1qBKV5EUTb9YMM9+Lf6N+7VEa0ckfQsXs/+vbvz1bFly7poQvlIboLkXjJ0/a/ KzjToQpHAuZsgJTiunDbiSgS/PVmbDD67TZRXr7dAyz8yjDs543rP+B85w0NebQm4xnC EoOihV8U36zl2sWnt6CspQsmzZYoLZjrCTXHMJZEtxM9GWZUWDvzm5N6niraWieCS+lV uPRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745972224; x=1746577024; 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=fvrjv7dk5ZaJxRV01miyZ7cd9Sjp3NRM3WvT9BGnc+1eWTX9vtbdrcG9U2M/vZqv4S fAmNLWOL83/zMGRwR2fchpRcu8Dl2hkusQliD5RLwZ4rsjFl9Q/RY6ptv67jDgLJB78K /WqgyakooBqaOBjuRt2MMbGRX0zIM42eKqmB2sxD0JpKwgn7ZHFTD31EbzlMng2Nptzp cVntYKSVjd92QlEpRDs8oRgvRLelCXtLsqhBjcXyhbj78SEJdNVdRY4zREiuvB4iJ9cq DPyswmAM2ZvkIqzJq2I4r3EkZtN73fqgYNUZiXEGnx7VsPLl0WX6Fz+XB8X2gyLMSpOj RK4g== X-Forwarded-Encrypted: i=1; AJvYcCV52V9hHAmAW8gFInpvjq8yDRmLkRQZHsoNsmWfNWpm9okuUyYcFnW2i8uF0hNgU/PrZU8FB2EiIg==@kvack.org X-Gm-Message-State: AOJu0YzwDW1spkx5eUa3rPic1W1GiDWLpMy4rYWzpEpnz9uh6c+EdSXT 5v6WTId1TKwpYlUbZjsJdnpjufsKBRlyyARGMYoWNF9Y0dAsHNnQjTOXN0qqcIU= X-Gm-Gg: ASbGncslIavJJxi2RaeFBtf2k0UI/HscwE5ObufFk0ZzDzAsigdSk3WhhN/gu0fX2aI 0hB+nk7ljn0zNIJ3jZQhb7Ej7sm20/Supb39tDbtIDtd5VvTaSbJfm2/APirHYjZ1ROFEV1s/nC 1tnkXW03sy3ogrLc4rFKk42oi9dczEDRNrJxKlDhs5L8OwTotSMKSBUyjwrBi2iLjDaFc6QutOf 5zesJvLDhOtQCkutcgsbTAdVNHbTQLJmurmcYvzeflyCJANFexFPYOYe5j4ixx2g9ZGygdOp1d1 doqPVWA8e5rliYKfWPf/X0g6r9BESC6vYdkK2nhUogtKZjfymsE= X-Google-Smtp-Source: AGHT+IETUwwJ4d9kfXWHNR8YmjXFfbtdbXscsI40rhUIk5loazjf0Fqjomn7xPnKqzjvxF+6nNXnLg== X-Received: by 2002:a17:902:dac8:b0:224:249f:9723 with SMTP id d9443c01a7336-22df35bf614mr17144255ad.51.1745972224122; Tue, 29 Apr 2025 17:17:04 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4d770d6sm109386035ad.17.2025.04.29.17.17.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 17:17:03 -0700 (PDT) From: Deepak Gupta Date: Tue, 29 Apr 2025 17:16:29 -0700 Subject: [PATCH v14 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: <20250429-v5_user_cfi_series-v14-12-5239410d012a@rivosinc.com> References: <20250429-v5_user_cfi_series-v14-0-5239410d012a@rivosinc.com> In-Reply-To: <20250429-v5_user_cfi_series-v14-0-5239410d012a@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: rspam12 X-Rspamd-Queue-Id: 58743180003 X-Rspam-User: X-Stat-Signature: fju8h16zzisrufbcashjrap8gxbm466p X-HE-Tag: 1745972225-755576 X-HE-Meta: U2FsdGVkX1+l/Q+PNyy8ONdH90s1+ysQPdi5sz0BzjsV1y7QjQ8y08zTtowxtiA2RVWQ1MnuEgv2RpOPO24kJrj8v4QWL4EwTK6zEzrbhEe0WNRVzIH88GKrhvkOUWQG4dwRUjtSG0N2GTIeFjrmXor+fuBPhNsEI1zOHJUqk9ICusG9gskzoqTSLpj7VlCbTGjkfThIJmCgwLbqsMA5fKk8VWLR0UvmNx6rHvFJVEQp6AjeCu1Lz5psmvzzgYXgPsQRvkU8abSwxBE0VRAG1PzQAi7dCu9iABm6xzpplb41jvJBj/6gIrKxk2Ukct6WgFcZdDnGoYFvWOXolFbRFIAQ913KVJdgghzK3D/VQMDO113LiRlQ83lgomB4yY1Sgtc5hCIzFbDi0uIvrAlNDA3tLDDpetd9S6gnJ5OgrRG6iKmuqRL/WOlLPnxzai8HVn8l4dXPssIFlhC5IUDWqCBiwGEHVSPYlxd35DwMQWJR1LmHumqWEu5dgSmFsitMD7GTYF1WSAATBetZXQVYtSUIaRCIZeb0WeenngmVUtM4szgReEkm65g9+sR4a+l5hv4rWmZMc2KLXa3bHWBTYwy0KvT4gkdESPZMjIdcIxgyIxN7eA8GuuSnqEJ3w+aDbvv2atj1qHfQPod11gVMtgH9EdaF8zM/GyHqzkyvlf03ruqlRDq/ekcDq9ecsVvHE7PBAvuHPxj4WxTuD9mUc13SCCcdSRM7KB220Bf7J8BEI6YIHCQs+EFs7ZAxj77fXjKDVEZAiARpHYf8FwUVDY1OZtiYVlgukoQ5tD6Rg5lk/pt4xP+X4W+7D5PBm3sV7f+N+BWot4IyaRvyIqNHd+ig7lgSNYgqoLMmJM2/+k3weAstXGvJpxJ0sIMS9RCPY6jD/1zzSHvKTV+mVQ4bPWr/388tMcwHnN6gkpANXTZ0DfHym1YrLiS3/6CtMuZHVjVeUrM4btHLh2pN7le 86Ig8OFF Xph0tXTiabh1sFZboXh35Zc37kU9yh01Hk453pTBotpa6wGuJmWsV12cms9rRasnjopCncsUCLHsV6Xvx2fIBsR/lZottXShsiZxeqyWokAIMsDuugBY4GWbu1SmnTzr0wes5RrlYonOqdrKO9arwzefJI/SlTBJRdYJcnIGEAUJFTO640JK54oZTHKCsLydc0OzP+pVrhXeKgx7gJJZvpR0Sl4XzahCCQ1niGZH+NTeBzMBhzEp6CW4fOGI+8ZMZKPYP0bQQeY958XJQ5Bs4dFYUUpma/0fwKekSgLATTjwbLqCjyiOER9Efc7KYgUEUQ4r5Gx/5Jyxr8B8NCjcOz1wX119FZubzmC89U7SbBpc6XHwIeccMJ9RLYk54vm+QhIlrU6DEEi2Z1ZLUnlPvpnJq6Fsjm8fu96492CtrjCxspYSwMJAulEDyBPksHb0URSV9gYQ3ay8Hv9rQfP96UpDi1v3fifEPucwtnPnJeDTI0Lc+NJNpbCns4HfrOAP/dhGdiHXBaFCyNN8= 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