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 9717CC3ABAD for ; Fri, 2 May 2025 23:31:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8C64F6B00B2; Fri, 2 May 2025 19:31:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 825F86B00B4; Fri, 2 May 2025 19:31:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62A8B6B00B5; Fri, 2 May 2025 19:31:19 -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 3DEC76B00B2 for ; Fri, 2 May 2025 19:31:19 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1EB5C14095F for ; Fri, 2 May 2025 23:31:20 +0000 (UTC) X-FDA: 83399566320.18.1B42FAF Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf16.hostedemail.com (Postfix) with ESMTP id 3441A18000E for ; Fri, 2 May 2025 23:31:18 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eiE6WcmJ; dmarc=none; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746228678; a=rsa-sha256; cv=none; b=Jw6BhtqtcuvmX+imseLBFJ81g4eHe6YcpMIi6Y008UcDLMXC0YmhPJXpFHHYVtzqdgc0VX 9CHZA3tb0lcC5fv58AkY5MBDzX3nC/WPQl4xK9ED/kGT/d39CClEgQCK3rY5nnohqPIPTD llLQ8vVolcbWGeaByK1qJ3Ej8Jdy+Zo= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eiE6WcmJ; dmarc=none; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 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=1746228678; 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=qTnZqQr5AALnnjQuL0yCj0+UMuS9rdDerrdXA0AAoNRNnR0m2qjulyzP2VIaWLLIzUGtg8 7/d8h9WhFm6rA3Z/U/XjEIxl3PLDjw9Htq+RykyKesXLibdSB3XcySIZvuUEItS5w0Dufz 7TWxRMhpXQz59k5IcIHpV2CFndzz8Fc= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-227914acd20so30962005ad.1 for ; Fri, 02 May 2025 16:31:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1746228677; x=1746833477; 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=eiE6WcmJ3bE/7Y5Po4XSENMB8jOZUgndGqW3YeZxsfbLBklLWGF7N1o9Pyinpit3cw gEQZ2IVOPMpXIyEMCgGY3nF/l2oGbHFA6XY9uBgXFP5uMNM9oyrxBVl1Mhr0SBoLVkp8 0YzsoM/39wIea+wO17HNxsTf+gCyjgKJQiqfz3lS2zTgLxmR1+TibPn+yngb51bWxyKp +QJdvW+j8lr9PZPwCEFzcS4N37ZfCxcC0KjenGcxJI6Hjv9RuPk2R3A7iJots3L+HIzE XcyGWDa4GaBPnDJT0FNCsj9I4wdPnsL78qyrmwVicE9R7jjD7pp34agbMAG8/6bwfC1x bfFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746228677; x=1746833477; 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=sLIdZVcszZHQmm/rpkakjg040CMjYULrGL31UqYEpRHnWLeY/oTDYiZKs3U/2AjV4+ WJkRB/4FmtCSnN4V/slhv89ZGrrShGv0S0l6N4AAra4ocy6mZBq6MyuvDuFEc/fojaFd zVi9qLC3idbGGMz8xROK5uHUSGea0RfmpD7B4mUqHVwoeElA1Pax5kBk/mwyxEpN2p/b atli4FpGKwwvu/GLUO/FDVeNhs4vn852ZXdv0RNyOp0mckFNP8y0pkLQCVz76oi/Ym2B RhyfjOvYTLYZ5zwf0nT9V7EyPHCnhgRhc8UU/iHS9d8KcvFoYYU3g0c7ke9vin4SQ6qf Cwrg== X-Forwarded-Encrypted: i=1; AJvYcCUqcWNq6VQ8wJ/lXcQ0DMn4SDnPGu+L3cdvcRwlWNIzCrBy8EqmT2jKnIBfbcTcOY4JWsL0fWE4hg==@kvack.org X-Gm-Message-State: AOJu0YzfA6x4r51JK9RB2fe9aX7rraJtx7zxv7do4ZTJ2N+Tl+M0+h2C ClWtBmpCZQhWfK0PlBiWtspK+g5aEiZXteGAUau7kf++pJtz2ot9AP1ZUlB56XA= X-Gm-Gg: ASbGncutSnM6qPG5MmsoyrYgOW+eTv+qPwWhxR4t8D9kYdPlX2LWxNWv9bGEDIrOauv gZSKalWJ2ZQkEtOHCdQ9P3Y+NPGlfsUfiV5QviwGWRL/xeLL8rm/1IwCBMBKPZSM4VQn3Hw8CuC AShlwBN9avF1f4AuQRSqg9fxedf5tosU9pucZuUBRAR4DQlGm6/LYbHgaMZkgOOJ2IJ+AMaMB6j RYCWTKFalUu0pkLKlq14cFREkVTpMGiMSMdgM1BzYkZZxvcVPOx4YbhxVSLF/9bDoEsZVtR3D3F N6KxTLIAPi/10a3FiJk+S4H1I4P6MqNEPcVPk4krXZ3EXgUNTz4= X-Google-Smtp-Source: AGHT+IGdM0ZyFpByNo71FdhH+ZE6YkSl+ciZeSMb8TkCWAq2KbFqMlYsDIiVt+3O/dRMF0m2vdNUlw== X-Received: by 2002:a17:902:cecf:b0:21f:58fd:d215 with SMTP id d9443c01a7336-22e0842fbf7mr116549395ad.11.1746228676899; Fri, 02 May 2025 16:31:16 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15228ff2sm13367055ad.180.2025.05.02.16.31.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 16:31:16 -0700 (PDT) From: Deepak Gupta Date: Fri, 02 May 2025 16:30:43 -0700 Subject: [PATCH v15 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: <20250502-v5_user_cfi_series-v15-12-914966471885@rivosinc.com> References: <20250502-v5_user_cfi_series-v15-0-914966471885@rivosinc.com> In-Reply-To: <20250502-v5_user_cfi_series-v15-0-914966471885@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-Queue-Id: 3441A18000E X-Stat-Signature: u7oax7fdkta7p467fqhoymc111xr8k4y X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1746228678-419982 X-HE-Meta: U2FsdGVkX1++pe68vkJFX8ALHYZDpqwgJcyl6HAas0SgP1NAYGwwwCd2Mn7wTUPYV+OJ7vsMI8lknpLiRbqqfNc/Z2rBG894WTXGqZRy8UaBj5EwNwZafsuYv1sOTjCzNaNRvvOwtIDLVqeHinyZ2hPOEp9l5J3ItHVexIRTGVf7LnFhKMXPMMue9wr0wg0wUcOgfJKWiOU6frA1xVb9D315/uor392N2YugQUAevehxNw9NhvwNwCwc3TmCPwFCs50QjPC8HkoqxXvluxf0Uj81mpQEvg0UU6V49h91bIPFoliSLG8/CChCUjkv4WdCXYEAUMsXhqtHV/uRib8pu8iI0GfJjJmDU4Kh7v3zU9gKcryM2Ztw/FjplosZ2lGyyjDC2F4lBzcWBwxeYLP/TUmhvsScxbjstOpYdSR3vOVLrQivLoZLpF3ZiTVMfwuwuEgphuV+DIuYHGUWi0tseaLlNnkHe/Sk5g4kw4KLupLbnmPr3mRNKhKe//kmcmNnHdCWwKkIapZ9wKHffwLYhAS8UPtN+OGLJLF2+wnYe86/PRlv/uXgDYoystZYLDrfm8UxAHWtPEyQkFXYqUZa1SAfjwSGBIFmTXcoRGsLo+JsE255l1xdocqO8KrygrnYUCX8hLvGtzMlF+YOjKBYxIuXbKZurF1HOq55dQubjdh2ezE+TWJmPFLwgcnfQ5FRy2Clox/VVXrd4g+OCGMHheiTCzEcL3NMypv+449gNmzPfXgR5WCOMhxPSJkC2dGv/8sN+OXHRsxcocNaAGAMbU0HNo8640MWSTTYc2mFqh2NUzEAdV/z5zUlKUdG66nLWqGfQP2wJQep8vV3i6DUTOvJE5EsZr6dtR8DWFZll1tjtZ78/t0fJOTSVdCDLsKybsXpiWC3RCSQmJlCEcDnxxYZIL6evVUaAGqHm0ffGnxZ39IqXBb9+dVWdGe+kDexcFOJTIvql2hKHDjLOLz 3+bJbs+z 6y3b43r6qeVdLCd2Ig9liroY6meliaeUNsgxr4eMPa9ZeTBbr30dEjvM2mtbwVzJehzG7mEY4yj1a1YMWDGyIDiSmn8QPrV+ENhfIz0o1ETQIYFJKNrzbqVRvOxhzRoiAilD/FeyhDPgX6J/opnJSbMdmnTRHYSVUt0qDCplCvpJj1JEDfWQUyhAVDzBhbPQZikVuzjiRn1f+4CoUeQz2FmueW6xnw+EKaPzD/9cSb8f6g0JPpfk828RVmlP4PII3WGHqIUsYHCTUUT531idgiYC91+76UxmxCn8N5AHekYpXrZY88BoPRUptAWfDxZjbEQiEwYQT3DeEjKSWtYuuLOWA9nIyC+zjg3jwYCZxc5CH/Ria/HORqu55cmGMIgV0wFQNsP2AeM0B02+4IC/W5h7lntVXlsHceXP7ytyRWOxlgto+jDUoP7TyYSkMpB0a0pQcwaVbV2h9JjKku6rmYlMYakZo0q+JgrGTBB5PHpQO6paHyq2STIJpWC21AFR/yP7YbXfebL/3Ws8= 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