From patchwork Fri Mar 14 21:39:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017499 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 8A4BBC28B30 for ; Fri, 14 Mar 2025 21:40:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A54E828001C; Fri, 14 Mar 2025 17:40:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B5CD280017; Fri, 14 Mar 2025 17:40:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7EB4C28001C; Fri, 14 Mar 2025 17:40:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5E5E6280017 for ; Fri, 14 Mar 2025 17:40:00 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 87E03140FCC for ; Fri, 14 Mar 2025 21:40:01 +0000 (UTC) X-FDA: 83221474602.19.1C588F4 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf29.hostedemail.com (Postfix) with ESMTP id 96807120006 for ; Fri, 14 Mar 2025 21:39:59 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=attndUuA; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 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=1741988399; 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=FSXRiaPQhF3C8L1paZRazUCu0Au2I7GQSlOCeptG0mo=; b=B7V/Ecxq52mgg0hvY8OjkDy9lTO16J2qOzzzvpmzbxTXdn/CvCIMHFHhRZFBAgnNnV3097 we1acR6ZUKfDTePNYiTHwKe3Ftbj9nzfDXnZbk7a3+hNVv6zemvmBQ8zV6pyvdLSahLs8G XiN3uEtOKDEFsWcxtZr6PLKPi3yx7NA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=attndUuA; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988399; a=rsa-sha256; cv=none; b=lNGxlxNZwqdJMXOp783lC7q3dfCR7qlbm1499UygHoMSj8fBlt2BIy/vcvwU6swL7cetej HYColtRSWBnTn4mEN+cscRUCBBW6HarwCXsukIEYubhz0fKB+SbHM8FceVlNLLgRwycQZY jdJf7RNViUz2L6JKtKZvx0Tw+TgV0JQ= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2241053582dso61487385ad.1 for ; Fri, 14 Mar 2025 14:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988398; x=1742593198; 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=FSXRiaPQhF3C8L1paZRazUCu0Au2I7GQSlOCeptG0mo=; b=attndUuALlcwAXiFce9rbaN/N3SO57kaSVLDa6piXGhPSWI5spIWNEs1inTwTXYUL5 Ques0vJyzet+81ksfUk+4/LhhDjlxkAOgk2RRp6II88fLqjnelFuFEQ8NJgaCrmATqbw pUnWoW1x7+iBhQfJiVMn+lImMd9OgpKMRXf+eG/Tchb+/xPZC6AC7c17pxWHKOLLq9XE Vmyko7Y3Yc687FVNVFDKQgAElqAAVeP7VFv1DYYz5Z0+tAfugDw0Xjy2Wv1ohr7kNQMb 9n62F1TTXXB6nRFZAZM4Zw+E/NpDbo9l6rGareeh2LelCSKBRXXVtq8oGByFov0n4onG 2R3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988398; x=1742593198; 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=FSXRiaPQhF3C8L1paZRazUCu0Au2I7GQSlOCeptG0mo=; b=qHYXRwXwOz93zxuumPc/xB1w33arBj4hGrQY1Ws9GVHcGNXPlk8X+CcCHYY72AsRvS I6BBL+bMTWGi5Nr+zMwkrlfdFLDIS5dOL0VuJYFkwzgaZ5yFnGrlEe1irdBOYspTo6mg HTnvQ5Iyor3RBKtM6+e+utosC8kfRFojlMu2CCU53Zae2gwfSe5YbLqjU7s5V0f9WVZz Yw5js8x/3wr2o5lRQ/UqxXQQjD7KlqK5DxJFnTgA+4tg35Cr+PTUSXz/dmRTi5V6CnOA 03BOib/3mNiSOZ8cM4+rpV1FsY2fg3D7Eefe4f2VXkv9cBM0VTLYXe5/ayuYiQSkgWX6 WLiQ== X-Forwarded-Encrypted: i=1; AJvYcCVS+U1SePjeuHo3zsnUukrWaCtuFW/TGJChjfX5yDAVG8Fd7ppzeqyQXC8EmlPX6x7rCBPANEjOFA==@kvack.org X-Gm-Message-State: AOJu0YyGrV2/yYl86m5fV4sgBVyRyXhzNQGOjsx3PZPPtRbfU7nMsffC Cmx8fpIOdEFdB5ccOTs+1BWgjRvZoCPaDnUZ4TiUDJxEeFvxsm9Qx2TZeqE7JkU= X-Gm-Gg: ASbGnctNUg64Lbe81lx1BwWuqtXCXcEwnnhK4x/MDLHAxzSzt7Zi2c4psPdQ7Woxbps KtCdgjmsG9HJDufBkXrGmivzdFOwyg+8pDRmP4uyOs9qKuoenJ/8Vcma1tTcChr4LOoP6zyjyr4 REZnmwUiLdVZVLhQXFYbKAChlc6wZdAuK4/070lW4QGPP44p/ijQ4+6NdVa/+UUiZuoXfH6nCUB FCg3/mEzNO4x3iXlV4zo/vytT31EgjhDnPFVg/DZGPtm5Scxf9BU50yZdLVYFs3zkHlM33vlfzt zAhCR8MgXN+Y2BBabTufh3nCstGQzkBJMM++XVoD3w4iixtQMF6rT3c= X-Google-Smtp-Source: AGHT+IH7jCIcDWCYr0Yu49RNZKZq6VgNs1mV3Eqj70D9Zm/jlLYpyqAM9w/Tb7MkRDYTOPVbu+3myA== X-Received: by 2002:a17:902:d50b:b0:223:5379:5e4e with SMTP id d9443c01a7336-225e0a62e97mr58609575ad.10.1741988398438; Fri, 14 Mar 2025 14:39:58 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:58 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:31 -0700 Subject: [PATCH v12 12/28] riscv: Implements arch agnostic shadow stack prctls MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-12-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@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: xypx8xy8frh1ixuxx95tor4yktn5zh6s X-Rspamd-Queue-Id: 96807120006 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1741988399-250922 X-HE-Meta: U2FsdGVkX1/bpZV/KJFz9TiobfAPhUNqh5r3uCLuc/mP8H/kG0yiuX2D/hJKu/IueJEdAaREi3Tk8yLyjJL9/kYzNr7GwZrj7o+czRTDgubVooPj/JztbWl2hy1OKbCicGO6xKyHCIhKxA4eWbK7obNKfeL6Ab1RCmEhkeM7hO04ilVfupwb1mGF6aR5dX6q7OFJanJQdHJEJy/RKPNT2ZjZh7jQ870WuaGN5ofZST1XCVSgyF4oK2G8s6ZmKu6qpc0QJLQj/UC2er6NSb8a+UhylG1HXHbHjbrLG2Jva+4RezpVxQVQtVRNwcr3zu2UTaI+WlRVhGqmDv8xBHwB4H8CYcMdJZsBLYugCdmZNWcvF+8eC5KL03xl06iKp001bzUG7IKlJlWMxzW6+J+xYIkpVrFzoNEAwdGaNPBmjZCTQzJrRxdHwG2u1HoVjhWSh8rzbus64XFV5frUWHvUGqckakghxQ2Of5ZoRfJTmIOGRDl4l3fZysmhFPsg7V/qBh3cdhT7vnLZmQbSMzRoD3kbQo7oywmp2XIrhz+q3ncEQe6DcZ6wXewgi+m0wBambseC7CW66eGY+LcM3tFHi0JIDrF7MWtL+tQv7yLyUgSXhVyDLuUJp+hGKHLXTaCIPECVZr0IB/LXRgwV2JOqmtiYnGzRjcyjjuMI6TYce+feMKQEWgdwkfQ+Mp6BlXVp+d8OVYTNbkFv+ydOQMCv/y1NZm3xxmmGvb3khmC/A05ZXu3CZo0ii4RqxHn+a2E7WnU85zQJulpq0ws0SUc2fQdF25NjJkWAX6jzlPomTeIiBgDyYTE9SVBVI5t+kL7Vfagw6AvD5ft57rBZLvkR8fJ3t+TBPrBMZSD/18D5AIwg6wd2TnPlYO6EVtufRNunniASZ/TjTuADQSA1iZhrirYQB0s1shbZyt5FkKDWsjNE/WCrvr/1adhFp7XlE+E2k6gjsnU+dkvbheeeuQL mI7rFRth 28g1mKLOmdhElIfAiIKDR3qm7l4/AEo84Fv5L8G9YWWL6rpUyN/T/xtLLJVQq+re5fU6K5cuGItYMxNe77VLMrNtstMzd1UqXLdpR7pQnEVEEw+dPN8sfm0zlkPIoY2+CBCCRqKbEVUMqMvDdd72hwxTaHy4h2PHufOpHyqyancZpGezk1GBu1qb3OjphSpDmwZcx9j1QJz5C3ckDnV4p4zotGB1RrEN38YWSHV8JDRfEA4votqe0+hzOkP84Q2kxsYlA9t2apgDjvPdyslE+i8cDN71iuduFqzqqJLT8euGmbAZwtQnavqtbkPfPr4zO9OQzoYbMoZDExlcSNgjZPULYtwtEP1GLQdbXlrSKtk+py1Mme7meC6r2wVZgNbczDEuLFsPQALfHgET8BoTazi4ZMlYwMoMdyM2OQ8o9UwB1coKNvjFkzKKsLjEVVyoRSOcQK8q1F7nxS3E= 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 | 110 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 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..b93b324eed26 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,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 @@ -262,3 +292,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; +}