From patchwork Wed Feb 5 01:21:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960373 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 63560C02196 for ; Wed, 5 Feb 2025 01:22:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 161E1280018; Tue, 4 Feb 2025 20:22:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C491280016; Tue, 4 Feb 2025 20:22:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5841280018; Tue, 4 Feb 2025 20:22:20 -0500 (EST) 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 C1FF7280016 for ; Tue, 4 Feb 2025 20:22:20 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2098880482 for ; Wed, 5 Feb 2025 01:22:20 +0000 (UTC) X-FDA: 83084140440.03.9381DE2 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf08.hostedemail.com (Postfix) with ESMTP id 2AB89160006 for ; Wed, 5 Feb 2025 01:22:17 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jFyh5hUf; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 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=1738718538; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=fwz7caUnw9PDcW/pbLX+2Com4kfXW/6HNSBid4S4qenSJ8Lq2cavC6B8r7OCcMNgtpHzuI t7FhdLHWetdU0RuCl9XjsNTWy8mv/eTGIiTEBbmDyC+sJMvdeQIVhA3oRUUefU1LoAAOeU XdTz8QY4NLJxBTQmx0UcMJF/yMhCxZE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718538; a=rsa-sha256; cv=none; b=vnpFy5+hjCYWFSl+BRHz9KVfAOdNwkULNod7gBxvJ9pf3th97NeNx0KkifsY0/U4s3IuoP qVEEq1GR5DohDT5St78sM68uFc4rXqhbT3NkBb/A6UCpjXXZxtpDunWqRppOTs7pvb8W8w +sjt58pZdWmwZq3IvqrsLXmj1VVSqZ0= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jFyh5hUf; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2f9da2a7004so883078a91.0 for ; Tue, 04 Feb 2025 17:22:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718537; x=1739323337; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=jFyh5hUfO/ozAJIGz/chPAPjtQc39UcLW6WiIYfWPr7+KQoj3kslSm6WxCMpanotHt yRnwLEpTxrXiclgEAn0s04OB6ZkSJ7ZyHYLnr04we9bYiqnLNoO86wjSfiBaGOy4zyVP t1jIiD4pmPxS9HaxH9iebCXegg58ljysaEL8QP1YWg8oip8DqXi3a4O1MZoPOMkIdqWn rvXP5rJtib7HnHAr9GMaTGSNYhpwsn+zb1FNrfkqtp9fT3l2ZptWgQhx9ODycW37PH/x oKvZO9sLZLlSJYqUwVldIqGhRTNIbwr+1U5VMq4SAxBhbL3DjnFJ6HGIJY5ZEmcK4hdd UK1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718537; x=1739323337; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=tKdbjPwkP7xB6j9hsuV8DP6N8ZzKjb6V3vUMFtcBlJeEFdk5nXWkRiU7xFJoho73Cq 5HwGAxFrcQXqfFHUA1WV5h2pL5qtCVGs4L+XQiZK8C16VY/GF2unfOXCvA0fW9vCqrN8 ga37lsKXBbAcm+kKi6ji/s6CssFfuEGV+taYqNHmNGJuAgdWffcgILkf9EEJPHg4TSGm aYbLa+tsa8wcpNte3LFhI3MgA7L5pg+cSiuLJPJfIliY6V8DOEEcFKQYFWzvk8QHvOBt sJ4PLYIHAYxoFJZtSa1igV/ZUVO0pBsDIHnnNqcClvaGKGhd2L3cml1UHS5h6hSFI/Yw PJnw== X-Forwarded-Encrypted: i=1; AJvYcCWAqflEhXm8QK0CcUFxUMpp1IjDTnzVPGVfK9oIaQ7vw/3ZUcHLiqfy5Mbn5xLsOaDY9WEUkWDs9A==@kvack.org X-Gm-Message-State: AOJu0YzUsfFz5ijH2VHQbYuT4UuKPhVH0iylgjG0TxbUjJr9PbNjtAeh XjMzYPH7BUTFBYM/5u9WHhzM0ALtVg6T8RtYX6bcMBq69ViIxyfMq3bE0W8SJ7I= X-Gm-Gg: ASbGncuRyUtswFmsi+HM4mjt+ZZ3rifrPsD69volvcMWqvA7T0VCYBBNzlZNb5UETua RUJMy1ECvSMT4IqgSr22YYT3mYXiNblxQGyjlLrSFGZyUXckmI8qvPRqeFhrgA5xhlcjjfFJtsc wIDcfAHNJHHe7qRFmcKQxXIWRyhd4NHrq00PM37aoBPhUuMguUGNQrYQ+iX31uOVh1So891W+if KnsDS3BrkVQsoKnbuv0kKIgFTxoVM99oYzMTr+FuBCYGn/Z4JKyhnZXqSlIV0LQUzqfjHw+3i/f optVUVDMvGN1t0SLULWTsx8igQ== X-Google-Smtp-Source: AGHT+IEV2JRI/u7jJ+DMFTPXNcstQgsHVFgvv9cPCm1RBElDa+SvGAhtxoxPORcsFm2xZuy3PMKfmQ== X-Received: by 2002:a05:6a00:3991:b0:728:e2cc:bfd6 with SMTP id d2e1a72fcca58-730351dd5d3mr1505033b3a.18.1738718536922; Tue, 04 Feb 2025 17:22:16 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69cec0fsm11457202b3a.137.2025.02.04.17.22.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:16 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:59 -0800 Subject: [PATCH v9 12/26] riscv: Implements arch agnostic shadow stack prctls MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-12-b37a49c5205c@rivosinc.com> References: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@rivosinc.com> In-Reply-To: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@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 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: pupzjn1bjahbg7k51twbpxc85g9dt84w X-Rspam-User: X-Rspamd-Queue-Id: 2AB89160006 X-Rspamd-Server: rspam03 X-HE-Tag: 1738718537-244893 X-HE-Meta: U2FsdGVkX18Sh8tl2q7V5DXDImsAtx7Xf712QXgL8o380hI+86WbAyPDsYVeOheWZyw6ymtuNc8aOpCYsgKQg+0zpzPAl3RVEYOGr2vACGx0DlB5ep1NjZ9QvgTyzh64Ap0WyMHm7y4zRfotrzPdnYgDEiMElo/osrM/BWxkgz6Kz9NYoD2PFgExTAjExaoHcxLej35n+KAM8kRFim4fcBx5RvgExd+CfDa4V4wK5bMvQfvMQIZNPefuYZbsjxg76jVUGiV4Uvj4x1BhpVv6+orUE1GL+xB/wCs2MJ6emp2UPbKoxELUX/XR4+g9YdVqJo/uSeqF6F4p0kLe6P8sL01rTJUFNSKrjFIrSaXlR108aeWFOK/RZxbM6ikjvwStZd5kSOa4zc13cDoJrBMP+P2W4l7dmsxLG231rSjEXM0DiMMBZXvzujb9C0PMpQVS8B5VsYE9GYXXrR+lCbpAmyMdR0JvjNa0L9icOGXh1JylR3ueVUzc4Rb5XEJcQTxoUATlyWQSXfhC2ydoVWnQ0K6YNvFP5YcY1BVI8DE094IDu1IACkAzyzOgF6kvDhIumeSag4yfJCtFh6fEthG0S/yYwr0k1B/MISwSfz9PIFs4ednDmLUTrDTJwf5pz5zapYlJXyFywaO1+9BwQLfDzMzEO5SUbj4uVxXM1j2GB2FwTfCyVmQOZKX4JIJXkaoR7TW/AD3iCT9sNSP5xxBeY+s5MVr4ZzcGaOABBY553/VKmSfmdsd4E7mY07PBD/FovUebfqgWC3qle2baEUewd+m46P8jX6aIN1dH3WuvrhWZkEE0u09iCzTuRg3Dan6UTaev8JCICuZ+CxNdjClobbzjrX6TKLzMidA5Lzp/614C39bhXEOJGcPrJeeRvhcj1Hf+wo4C+acEH0iD+FcBNCIQhLy0jXSgXo2JTFPvwrspNYCt3CXEOfYNQJh9xCgjlQt6BYGLajwfSAysy/z 9U5pTxbv Couth/A0Jz/F3YCMv8biklbeZP0n4rHjL2A0c4dDTs1EQNk/zfrZtzKFugIRJNrO8dKEHQc97wHVIgnXXLsqvDxEYjm24/arjhWat7C8U5TrnI1cE7Wv/jCFCWwT+mU7lmDpLjsG4WSrdQlTv/fKtgDfAEeAwN3GethPr7cBHKU+e0T13pCofODYUA9szyM2Vqy42g3bCou1Mg2p6uCPYT3ex8XmFtzI0lhU1SLlVRZjOJS6BKB76kBb/vD58d0ZwL+tOMLdKwWmDXTrQWl3Z03kSXfbuJToaBSx1cRVHfMtTiOKD3AGGMD5nnhDZQ+nw8yNYNfe7D81NDLk18RpO4I5WtTG8BnQnINSua1jU82N1qYCGtnmT949foUk80OKVLqpBgZaixdN9eAAvwsAOlghjqvaEcBXncNKOTYj8g9r1y8xwqoN82Sb25L8GiF+E8m7UCbgDv2FX/CYj4HLLSW78rw== 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 82d28ac98d76..c4dcd256f19a 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 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 73cf87dab186..37d6fb8144e7 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 @@ -262,3 +289,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; +}