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 04877C61CE7 for ; Wed, 4 Jun 2025 17:16:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64E0D8D0038; Wed, 4 Jun 2025 13:16:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D5C48D0007; Wed, 4 Jun 2025 13:16:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 451718D0038; Wed, 4 Jun 2025 13:16:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1D5F48D0007 for ; Wed, 4 Jun 2025 13:16:54 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B80BDE9B4A for ; Wed, 4 Jun 2025 17:16:53 +0000 (UTC) X-FDA: 83518373106.15.586AF42 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by imf24.hostedemail.com (Postfix) with ESMTP id C5CD518000A for ; Wed, 4 Jun 2025 17:16:51 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Mf2KEgH6; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.180 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=1749057411; 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=F0XZmZGXQguJXTTs7yc7Y2zAiwpuwR+GOqO6NersdS4=; b=6F/MpLg0V0hOjJ00FBmdmDzAZduj2FIgUSH71wV0+3SEpu6bUPtwT2Dz6M34AxvXHF5/Fw 8NoB4Yt6DnkcB5Nq/vjrzYIM91/CPypOT6psecqRJTzGNQphHW82TQDT7U7arkZRr5ogme cgHuZEjSKJsQjEvRm4yDGS8A1kYgIF4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Mf2KEgH6; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.180 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749057411; a=rsa-sha256; cv=none; b=Zt0vXvrWK1Np0mAVc8lRYSdyw55I0Z51cezor4VPykNnDhFaip/bVasVdX8xJvukvzzN2K PH21J6rCutYupgVD8eMF15sdWfUUU/kO3U0PUeEsEahxHUg8SH4hZo2NKp4j36rF9Uf48t 8p1X6cQan9BP29gETd9fawhgsAwWBE4= Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-b26f7d2c1f1so40492a12.0 for ; Wed, 04 Jun 2025 10:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1749057411; x=1749662211; 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=F0XZmZGXQguJXTTs7yc7Y2zAiwpuwR+GOqO6NersdS4=; b=Mf2KEgH65XM1pqEfy6r2HGAwf64Y/DMiO0Oj4GGA9aXl+gbsNOtkwYOeTYq/sQoPiQ 0GDh49y19ek/EBSVSmPjVievR4qOF958DcGSXCURrRfguDyuQqKSBzEj3Y2jYOWx8C39 3QV6YKeYcXt5DWQPKm0Nc4zFn5BLaTe0DbChKBqNId6rwXeVTzvJ8cW9gfpx7a0SrBND 7KQZF04V/K1vSKSczp0K0MxNlt9N6gDeTC31LYlxZ6EvsA5rTfTVOOG3dTWBE1+GRVqp F9erguIvHi44Ppy9IKPAfmWXtn+36FxLZK+L03h3G66X3ilIQ+UpKXpqfsEKznPm9+el 0OlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749057411; x=1749662211; 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=F0XZmZGXQguJXTTs7yc7Y2zAiwpuwR+GOqO6NersdS4=; b=uZCb0t5UdGAOqcNdoKDWxvI2ZFGKWAgiuvLaHss5kCmHYcC0U30vJHdQvtfq94+wPq fUEytjwopQPRg+rsH5EWYpHorQoVjIN8YDhlVwD1p6KzHdr/+M2RJCBImMRhb6DzSgJH 2xj6YMQQ53XHfG7GubAg2KDp/AfBDXvtm0Z04CQtkqkLBJx6Wci0txfrbydG0p5mOP8Q 6RLXXVGo04/MRlxGnIkdo3yXkxCUeGt5QeP081bncdgO2SgjR/KZswtOGurx1vhCYb6+ LW1HPQZy/womD1vEirUTDXRdNH657edwZHkYxtqNGj/kIFRh8nvdfbKavUrzg3P6QjL0 pnBg== X-Forwarded-Encrypted: i=1; AJvYcCUKMYpUNgMSb2f270mZgzyCQEY2IqKYXlii7Be0eNsN4ftDfkZPGTbZs9cncnyMvuES5p2lvYxPxg==@kvack.org X-Gm-Message-State: AOJu0YyYEPWyvUukh+BFvybo0lyZI2INukHcZvRTIfvGsYuBsKz6PMhF OrlHcOE/EyEE3snxPzeu3bIARaSNqx0ilxDTkcnzG0lu0946rzoTGrpwMPi9j6XITys= X-Gm-Gg: ASbGncvTes5etKZdjDyvIeARuWZAznBFoLkm9rsQ4p0WMlgS/0nZVDUF1xRIPIgppnB BKYeNpNzJZTqtOz7CbswHqV23Nys6UJlaD+PWpOrzRVEKN+3n/NpnU0qzFQl/Cm6n/s+zfW+39E jXtfgUI0b44F5O7PHCwPr9QZcDJMeBweX69zddqARDyqT+q/jlzZJKwAUaGDO310akXC+o8pFvc DlWk7gTvHhDasBqFqppbnMybHOXMfM9qkliN8qviAB06nZvkBh6nf7y4YD9T+GUdrjEWdxVbycJ YVYFSHJybM4sP9PP1Wc9iYtm4f4lw6xZ3PK4n7zej+nwZ8Gz4p2le8MfODabPQ== X-Google-Smtp-Source: AGHT+IFwZwWseZlrf3vDFxck4fH7qGOhZXmEzl0kVhLOvVDJdSB5jVvKz6MH30dIxiIknbMFZP9mGw== X-Received: by 2002:a17:90a:6fa5:b0:30e:3718:e9d with SMTP id 98e67ed59e1d1-3130cd862f5mr4154153a91.35.1749057410565; Wed, 04 Jun 2025 10:16:50 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3124e2e9c9fsm9178972a91.30.2025.06.04.10.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jun 2025 10:16:50 -0700 (PDT) From: Deepak Gupta Date: Wed, 04 Jun 2025 10:15:36 -0700 Subject: [PATCH v17 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: <20250604-v5_user_cfi_series-v17-12-4565c2cf869f@rivosinc.com> References: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@rivosinc.com> In-Reply-To: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@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-Rspam-User: X-Rspamd-Queue-Id: C5CD518000A X-Rspamd-Server: rspam09 X-Stat-Signature: 8p41ffcrsihw5qxmn5d5cft5b7h63nbj X-HE-Tag: 1749057411-835621 X-HE-Meta: U2FsdGVkX190RFxjV+FMI9zh1/4q86RAgGtLRPsweYVZvrm9ToB06Gs4tY6mfJZTae9fzjZn1j16UZaDQulkv61NIR7K3w/3IM8eTWKKTBcdaik8xPcc3daAFhPG7kx0S385e3zxo6/VH3j3x6We5ag6EqXiIH5LEccTZRWTAJzdPSkwpNvqlGpn59fjTk9wzhEN3l0xTJeT6QvAQTcgVmEyd0pljXfCoHqmaHSWEZjjE/F4YH6fMlUuE4hXFIj0Y2JGoplJajeWzE2Y00H8kb8nlaHlLJIhoxEEV/Vy9SCGf2IwWuJqd2iBVjswkK55iTxum5th3Rs4uHW2M2ESOE5IU0aTv/z76pksmw0rBz+TD6piDUgtEJ0Ld3UOlBqOjDVpeerloXnV6r3FEEkOd7o3HBAeUyT745A0ULAIeO2zpjYo9sqfb+jqrJV/IZ8mNBKIlChycsvGeoAtmFuAx6eJWi4JajJltUE6ggudWatexPyATuLxcdxf5LlqMn2px7BXvMas0qDyQEVjumwU1ZLZZo0hPxbESPV6U+lGEpBSDeDBG8yqhsBnE2YNzPBrik6E9OfWK+OI1zzki2BreNRGazAnXz5lEdz7OlRg12G+64v6X8wxPY6rKJfwTaUpYE+LXfuu2XKwPQq8JLRS6SjpkRVANv5CxHV1m3mJaVYK1kmwATUKP4Fo3LGJj9Pe+N89Goa+vE5gO2zHLJELwxFiIQvabL3p/Wh7ImRQgH4r2yX11NBrtzEzH2bnlx+dkaq2gOPiiYHWijPCIXKSMeYsjIGEkt7qovi3Ej5ndXX3UsvDl66tIcPjxFfHqsdxWEnPO2rwoxBn1cLbRuQBb70R7j1ePWYy+lX4Onk6/eahI9ZLUr0+rlGSKTiOiLEIuVCA7Qaa3mhPf4R0cplTVBpGs5ckjCz61gdaOlZ5JIoql1yoSGpCXeZ8nxGORsSPmFhqRyxuWqNKXYsWdmo SOi0JiWn TQtloqX38sWh0EQFWUondAD7Cw/1rtxBqXB+Xpr1KcqbL2VS5atQiOYz1LqNuNZOxAUoRZ0wjDeMwNWYuxVb3DZ1Nj6/ma+PFhWIiQLZ+zKoICs9lRxJLIDFw2gEZVoV0mnLDTmExMjdsJ0gcp03tT18JmZjNLoD1y7pRfo4G5g9Ynx5QqqYtGEFTyiZHikMZYzxuwlScG3SV63i7N6SdO0lvLOnClmeLsX3yLzVs+SQfx7LTz9Gi513vEtKIzSjJFtGzT+3+3jGx4k38kzn9ze2Gv3VFYNER0ydQ5m8W6aPZPN/f2sB1N/czIaRSkrXcmxwAuAuss0ZQ8iYy9/CbuBJ8fM9g8W31CjCiBPxcs9BGJoA4vlgywInZ7uTB5e85FBOCrufkjCktBIG4gnqHGcwvg2AupsM5jVv73REwaVWslbVBqxBuAehKhzUUhWQfG4xYja1D4+Ad99gQTi7JOkyNyYq+G4v8BQhMNUEjI//iIU0YObOVZlQdI+1RClI3LHKL7ElvgVbOBtU= 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 0c81cc9a2b6d..f747ad469c7c 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) do {} while (0) + +#define set_shstk_status(task, enable) do {} while (0) + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 46f38e53ddec..3099fadb0397 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