From patchwork Mon Nov 11 20:54:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13871352 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 30C74D3ABF4 for ; Mon, 11 Nov 2024 20:54:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DDDAB6B00B3; Mon, 11 Nov 2024 15:54:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D66806B00B4; Mon, 11 Nov 2024 15:54:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB8A56B00C9; Mon, 11 Nov 2024 15:54:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 8FECD6B00B3 for ; Mon, 11 Nov 2024 15:54:38 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 51D521C7781 for ; Mon, 11 Nov 2024 20:54:38 +0000 (UTC) X-FDA: 82775016996.18.4B920C7 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by imf06.hostedemail.com (Postfix) with ESMTP id 5E8D1180008 for ; Mon, 11 Nov 2024 20:54:07 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=qJXrXtGr; dmarc=none; spf=pass (imf06.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.49 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731358301; a=rsa-sha256; cv=none; b=EbkCWutl4W3YafCIYlt91C/0dX8HumA+D7kW9rrLU80wUyZlbqxp0yQNmibGdgGTzAzdBI Wexe0SF6FtDG7ikxXg79+ir0MinzLIcZIf6mnAGxytyBNJ/I/AgPO9PbdVU8Hsi6SW0rdN DgJSW6El7Izus/i/DzOMAfWP2vecdXs= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=qJXrXtGr; dmarc=none; spf=pass (imf06.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.49 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=1731358301; 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=Bc9do2wGuzj1eP6qZZgzxfwHTGGkfddAzVikzQI29pQ=; b=gcMZsXLPhfI7FYsSGk8qyn5dKvVV2SXic/ThCcX4Bwugdy1P0G2TO9LbEFk15eDu8zQ0Mr GSVkL6AGfKA92BpziX9RMVgCKqH2mYj7eM/IYTpk48buvKUN+JSEV6hL8z154kKCPYp5Be +wprQW4Lg2FKJtBNB4QKn+zxocmrDL0= Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2e34a089cd3so4001198a91.3 for ; Mon, 11 Nov 2024 12:54:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1731358475; x=1731963275; 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=Bc9do2wGuzj1eP6qZZgzxfwHTGGkfddAzVikzQI29pQ=; b=qJXrXtGr+uk2SDbvX92lYFYXdtuO6dN4Nvn4zf3sdHr+rLTXiElpNmNEGYdqcwt3R1 Reg1rmldLVIZ1rxbuYDfkgK7hOAJZekq0asLMIG9qo42sh9deyvIRBkf2EwMHnreN+V8 voHBpnYu2tGkPLGLFLj4l1ZTr+hV+JJ+m7h2IoIR1kI09fe4b0Hl4Ad5xOjbA3bOIGm4 tlbwqmoJqp6Y1WBuEDHHzBG+e/bsJcBxcVGevW6QF1yGo7ATCSYGm0LEOuV8CXDolmVz QSpFTYFhKe/PRBWiQhR1mlUvUdX18QE5RLLXeb3BxXjOQv1BZO4XmJ9ImlyBvT7FfE0z svuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731358475; x=1731963275; 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=Bc9do2wGuzj1eP6qZZgzxfwHTGGkfddAzVikzQI29pQ=; b=ZqO9ozYiFvxhi6CuwU2vlFIVwIwNtLVNOHuLVu3+9CPUnHZ0bVaRBNkJz87gtippaM NikjqKGjcten0OM+HusrZ5tcl5jUhkDxDOIhCvo60nmKfMmf/YuSMh4NVYZH5ad1cHh/ 37BjBXBkFpb0uVv21e/o0yI1ed0wCNN0Azw8cN6KnBeHeVlnLqTsOYxXU8ezpp3jzPic R2E1SwFGz2gA4fpx5nOy1XJV3WxRqgH8SHMrkpC6Jom07QVsF23tSwSBTSQw0Rmi83qd 5YEQrm8N0/c9Rb54sAxrLc6vwyEIVHG5DTZG8dGaku9jlexJVI102eqLcfqO1rfK6V1f XVEg== X-Forwarded-Encrypted: i=1; AJvYcCWsVEQwsCUo51s0waqMeT4Tq9GI+oi1ezF8/HL3IjGAezkJH3qnNKrCfZ+qEJYm3UkrndcDMKdFeg==@kvack.org X-Gm-Message-State: AOJu0Yy/lj/EHlBGE38TpaT3zEuCwazVBiEJsoW9kNsCG923rfmz5QjM 6w8IPRy/fcCXd2v3m+BMLp0VdnP5ghJXisDVjx6/ilau7fXB6gkRFXaKRlYcnSB7Rr7ZtF58U+W b X-Google-Smtp-Source: AGHT+IF4wkFd85cIkcI7NHWbdE7I1jkIGxMhtMNyVn10dQdo2iBskWZP06IO2hI/qj5cM/xUlknvQg== X-Received: by 2002:a17:90b:2ecb:b0:2e2:c6b9:fd4a with SMTP id 98e67ed59e1d1-2e9b173ee41mr21139525a91.18.1731358475186; Mon, 11 Nov 2024 12:54:35 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e9a5fd1534sm9059974a91.42.2024.11.11.12.54.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2024 12:54:34 -0800 (PST) From: Deepak Gupta Date: Mon, 11 Nov 2024 12:54:00 -0800 Subject: [PATCH v8 15/29] riscv: Implements arch agnostic shadow stack prctls MIME-Version: 1.0 Message-Id: <20241111-v5_user_cfi_series-v8-15-dce14aa30207@rivosinc.com> References: <20241111-v5_user_cfi_series-v8-0-dce14aa30207@rivosinc.com> In-Reply-To: <20241111-v5_user_cfi_series-v8-0-dce14aa30207@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 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-Stat-Signature: b6qzp1jd8rcimo4ui44yw74bon88ys16 X-Rspamd-Queue-Id: 5E8D1180008 X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1731358447-395723 X-HE-Meta: U2FsdGVkX1++5fy1G/MRfvbCNniZg/uzxOXNra+zvj9vbPMU//PS3Y1HOnkaf3/Qu9HKNdlAO5K9Bqo7Xd7k+QdvnVmiHdTpzAZT09nTNQhfdL2pZ8/NFeYoJWykyqBJz62dcuYeLq4dYsMeG5uOw4TsRHm/VNHra31x8ki808IMrY8tYUpyF/3TxL++QeXHdlBrze/SX32Vs6cJm6ruwpUW9ZxxFGpFhJhdRd7UK/50pa0DWkWt93+JPdg0FJf9fFYXHbwwSVop4PFJSkhS18MCuK1zwv5yzIzKWwruR4CWRyAulUfmchSGFRyPqtgzhhaiun/+EtaSblZjO6qKAr1+swVCOFyfqILBA1BQ7d5ELZQq09oIFLS88CRugg6dE1yiHz8BjgvqDhX8jtGksfYAsPv8ccvJSQUPE2j/VChDgTOoQUZturJgTHY50tcKHV5WsVk/FyLMhXFeNAsWrOaL/qSWKYWPzMdJkuxFMvdZOgqSG513K3iNIkT44T7VZZa78SMSOXkiL38pOOcmW4+oiBtOw+5NUydnlcJZ5RVQPZUolQdEnPlDhZeh2JbVy+nfhRdRsCgC3ftjaYHE+o4qKJ2i9MRFcyONbhNIuhV8uNNwvHFaGsXUcLnpMv9NuFWEwQAcRjmfU/fuQ3RdnQ5mk8MW9457BeGhqO7BiFoMnVIVQbVjeDesL1JT6PC+5CkOTofxwVBqNykPCsJpjvMCx6B1JhKisHmJugCwyAotlOH9Ariqv4vUtFDclam07P37rZB18LSPTm09vrenOHyMhDdAcS5mj5jw+PspPI0jqdoTRGs4kxByvCd/tDFqKkueLm9NwOUTwCLRiS2nl9BXNNSthNm0wwtksxAgkOxr9wOkeVaQEzmh6SG3CyGhkulyN4FABhI6uldcOpSS5lkvsbjUXwvJMp4nAdzAlcH1ufVKuZ9k4G/uwCbSd87YkWfjDzpie2vJRG1QvPr Sqs4jDmw e2MzsaAireL7YfPS7katwOzQslXvJvmdNlCvGMcHC64nfUMbJp898Grxx/FUd6BOvfVYCv3Zw8gDWkSqG9+ART+o3KP6u/mngTlw3q0Howq49GcD1UquJU0NaREGAdlaPO5OMlC2RtfPbnsewa1iMewitH7FzmZYQ7dKZm5GDSRA8fyg8T80mHm/qPLIDdoffP/TVm+lQUyeBUJrI776E2mZ3NXO0x1VkrVw4I8AlVwmbqyERHEgTEVXmUW2RRMyjrbIjpTrYhD1GVOSqYiL8v0lmncNzsYvejezBSVwFspPQXbFSj+1kllu69Z3/T3nMe93jmwZ+TRWiziMx36VOtfT0cg3gJJRqAPDBOLg2gdRgHUsbLTlNXbqDqhUg2n20+0EM8NELcxDegYYxwKI5JwPj263g8XLkszm1Dr7TWi3AJS4ethNvpQAot0Cq1XFNMa/AROSsXVMZCt0= 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 4da9cbc8f9b5..0b3aff008c85 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 2e8bd30a2b49..d75721b243af 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 6cd166b73316..141ef70b08a3 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 @@ -264,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; +}