From patchwork Mon Feb 10 20:26:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968608 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 C5773C021A2 for ; Mon, 10 Feb 2025 20:27:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0C3728001D; Mon, 10 Feb 2025 15:27:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A95C7280016; Mon, 10 Feb 2025 15:27:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E79028001D; Mon, 10 Feb 2025 15:27:15 -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 6C5E6280016 for ; Mon, 10 Feb 2025 15:27:15 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 2CE961C7622 for ; Mon, 10 Feb 2025 20:27:15 +0000 (UTC) X-FDA: 83105169630.16.7D36951 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf22.hostedemail.com (Postfix) with ESMTP id 3FFB7C0012 for ; Mon, 10 Feb 2025 20:27:13 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Rh0I7nv7; spf=pass (imf22.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 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=1739219233; 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=wPGCQRUIGIe3c/AW2ptWMmpAEKlkHe7ZVTzpZ1Ka5Ok+1KMo3YFTEnGa1eH7yJBxkoZefG SYrv2IOX7bpjY9FIWhNicj42GF5gIw4Hvqi2Ji+a/dDiKFyx9eBelcqFvDr0K5hPeUiDap xW3hQknyRp51jxyowP7Gx+QGgUQR29M= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Rh0I7nv7; spf=pass (imf22.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219233; a=rsa-sha256; cv=none; b=SPyWPmcvhf38UCTJ374fsHzrQL7BuRcdzreg7Bx7L3z/Ie4CKESP7Gt4/iBRISQa6IsiPM Q9bQ5wAuXoF1BuqEUXeeE5Y9Ko/aY4GmApwImMO9sDdN8YaZ07QQEiYf0v7qdHFmPJL1qd tWxp8z8SYBBnNZjoX2NjfGa2eOir+s0= Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2f441791e40so6639072a91.3 for ; Mon, 10 Feb 2025 12:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219232; x=1739824032; 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=Rh0I7nv7uecUE0MhEfKNOXboXdLUN0okzoTYC/TMCHEUgNe29Nrhz78Mt+OlAoiuF8 VUOFRBtghDCPK7fkwE/xGgY3z53iK0y5LSc2k45eD8+/xFbr03REiJ+Ba1zsSoXGhpSt 0d9/5kVvtnK7977osYBMMnYPocnaVCTa7X8JTszGyqvI5l0vyH/nZsfMErlxINmvtmDc XdvN5vQ2/BrD9s3b5yx/62k47IHw6xAH2eqkAd7XoyE1j/9KwVGmMQeTwTHvDomRw4Aw ppIC3hVN9R97MeucXJrurvdCd+g2RDnGqYgurvqdHxpqobYRYFKrOXnQF4FJbPMKPc0M GDQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219232; x=1739824032; 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=sB1GNMfwG6f/WFaZm0c1ujANlp5UGrVxXkLGlJChdnxZX0XQ1JaYXryK8uaNMoX8qN mZEx46cAfGnZrynMLMaOOcm7otuRJO7k0W+shNk+WY9D3T8Of4v5fRNLrOtdNG3yq3kL d/bs4OrVZyi7KUB9/h8AqY0Szrlq21Sd/koo79khD5nJohS9TJiLJU7tVYhukZQfe4il qIouinw5F5IV4WFG+LSQfSMHFs9pFxf1OUIWedmCgLHp9+cvV9Pp6blSpb85feMPaRJu ITD/kYJggGGMeO7U+7PFDQyGc/oiXdjQCwBvwImtGwRHaIP1iC96xFLF20oy8V/w9V3u wz8w== X-Forwarded-Encrypted: i=1; AJvYcCXVZ91owzxIWIudzbxlFwf+eJhQjS36bfNgY9AH1axVMLdxGMoKzzXsH7+OmIf+2sjur1fNRfVrFQ==@kvack.org X-Gm-Message-State: AOJu0Yx0NkmHxhiJZaNqhBUbz33tc0YBOLQum84wime9caHXSmSwUBNR OMQdfEyeQD1We8cqXY14svXQ/HTzuROslUsZ+iE8DCogGTXAWbyaQNdyUdUDdgs= X-Gm-Gg: ASbGnctPmVUq4Cn6SDJGL0aQHCy/iC8/NfDEF2tBP6N2HPzJZeqrIiTIhyg4pEpJVTw 6ebictHKEOZqVedHJi9Qgj2vhWkS4hYyxoToV1dnWPG1ScbpeXTmtbb0HqkB0LCVc5LDaU1D2NI POm+mxrEkuOnqG9yFAXFVXYjoDbAOJgUozl2YAzIpMZ1e82aHMzrj/522CxxrP162w7OQdiRy3r 7WPiB4AD7iAYdhnmM7LQeCM/6UVAdq1FHB1WzjridHfxp8D9I49rEkyF59SXi/op/+AyCDYboWc cFCaZYKnCJv0CeuKmPmRizIjcA== X-Google-Smtp-Source: AGHT+IE5Dg5nkfBxu0gDkqjTzqTfKYquc9Psb1XN5Wmp92oZsUVGzrjZXZcy3FDrBIXQzaUWIDbAIg== X-Received: by 2002:a17:90b:3f4d:b0:2ee:c9d8:d01a with SMTP id 98e67ed59e1d1-2fa24064713mr22932653a91.11.1739219231942; Mon, 10 Feb 2025 12:27:11 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.27.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:11 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:45 -0800 Subject: [PATCH v10 12/27] riscv: Implements arch agnostic shadow stack prctls MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-12-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 3FFB7C0012 X-Stat-Signature: 5bfdjp4wsdyq4hzrow6ct3rnj8nqgx6w X-Rspam-User: X-HE-Tag: 1739219233-127759 X-HE-Meta: U2FsdGVkX1+6E08ervx8FusP+CLZ8ICzs4cMINBpmo8CAp1AENqfnbyzeMM5MAbWvv6j1hBBzDGXd7yNwgDDRwXbgdiMt9oDmycPPmgwicJpkeIvPNwokZUHLAHNtk6tw+9ho0xXeiscPOzLmB82kRl47U7+QMtZwI9/WSznFzj+neyCY13ujwWoz/mVWLyuBu5eURXIwD9tfYrhy5DlVHy/LMu8pPUDfoAWwS3AtAfmMbAfhQntrxpLJAtqDYkp+/3LVIlIYepniYaHzx+zE8aQJB1Wj4pnpTsV7GrEauhocx5dGvRsDURQjp9yidWJRIfDZFTQNAQD+8ztdVVnUHIfS6k2zQHF8a0S2wtjdmEokMzP4Nw6iMKfo1ChkJ86pYNQY5p1hlAlQGl0C+tZo/QCAnPl8nA4ijWmftrwjg0IDUvtZKMpdF3GuJA1n/wwuYjzwrDQTLygU6dQ5TmX//hcSB67B7AAQmsHNCK5Upa0DTVf+9dNvbsAZx9Dz1DmQBz/mQmeJ8d2/PGyoKhWNhlj4z/OZFeEFdHXUIPoXlwS2B66Lom2viU/KGrhTecG9e+IbSL2qid60J69hvL55LwWh+AHPCsGRfcbbQNR0jOoMVuHOx4ftqiJqMTRuz3SBbc413iI3mBUA4yOPVzOyBfcFW2pUz+yS/7vGvxet+zouEYDQyg6FZk6d3QRAD0MA4QgNbV3pl+n3ib1yw372dBkcLfeYSlvs2TyttpyIfzwVlJmu5XIj/1fBUdDfwbP1etNjSJcjGwOHtbYKU3l1+G5EG1AYqtXjyQq0U4zv6s5eHLbTSHwK4gqpttCplXQmJ3pXptZki2REIZKINcTj6uauT/z//pC8HDQ7nLuMpKIHA2XKFDYaNo7n7VPGGvRShIxJ5U3GvhDbDF5WwG8NqLZvr+vIIuya9eP/HYb9eqZ+1h3QA4E1+uSQOwTPpzTbFpVFIuLnqlwPIaW9qE OBFHuECl JduRgyUovITC3FE7Vd/cPFyqvTErfvMZqP9o3aeoS3z0JzVLuFgTphSnMyG6RPcM/6c28tkPifcQs52ppelhS5sOMVzTMjBUCE7Jse1kb5jBjBzxujW6TfroSKZu3ChoQh/sJnGCP+NhsZG4n8eVElvz0qM5Htr+yvgHqfiQPllYSRNZzwO/gfBO+mpj1VLBVk9Jws+MLm/mQZotSkkLao/XH5PCXXTaKX0UvSyobIgt4FKD3lNQwcTf0c2tPXGk54aVL0qY3HY2q0lPjC1hQaw6qJ1ijF975UVmhdweD5AJbOWFoJTQBs3Ay/F4ZzxFvbSXiTwqUpeGSX8XLc7u5m2HgNV6T+5QZ/rHSivgCHSoFmlEVs8Y+1HNaZQhvL++jUwkvigld2Co7xHz2RJfMUfY4T7t7UVmw2PDcjvLu6ivfeJUruJPpPnKjkVZEFMz7JoTUJvUup3JxoLS4MQDb+Nn0LQ== 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; +}