From patchwork Wed Apr 3 23:35:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13616813 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 1E15ECD128A for ; Wed, 3 Apr 2024 23:42:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A94BA6B00BC; Wed, 3 Apr 2024 19:42:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A455A6B00BD; Wed, 3 Apr 2024 19:42:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8700D6B00BE; Wed, 3 Apr 2024 19:42:29 -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 674626B00BC for ; Wed, 3 Apr 2024 19:42:29 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2E41D1205DF for ; Wed, 3 Apr 2024 23:42:29 +0000 (UTC) X-FDA: 81969847218.08.26676AB Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf11.hostedemail.com (Postfix) with ESMTP id 73C7B40008 for ; Wed, 3 Apr 2024 23:42:27 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jS6zYaWX; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 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=1712187747; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LYjXbKsZWObysa039N5fpdCtqQMANxENOQ8uS4k07nc=; b=k2ZNYhN1EP8WR7cczwu4ATtLFKXCMlDeVTY0zxKyHBzaMr3ROph72yoUJadiCjgdZ2dmw+ VV3IbNCQsRDsu3BLIhDtCsAW6Kl5CV4bPmlYC21PDVXhbAgX/4DWmUQnBy1MMIF6IttTbk a0yn/WJDpgICKn4A2AEjEPda370kwzQ= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jS6zYaWX; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712187747; a=rsa-sha256; cv=none; b=iWGTPaEnk5RTqjHdw2N+rAvPWGk1z5oAMUG2VPuB27Pq/64hjKgjLfYXYxB1rTxGUAAXOR 6fbbl8rzZtEDFJb3h9QHCHu6H+ae+SnQUxmLY8qMBXNjQyKVeQqBC/ZZ1apv6glv4H7/KR Szo3lRgsZfI7GKwI5LCDCwe3N7HceYo= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1e0edd0340fso3359315ad.2 for ; Wed, 03 Apr 2024 16:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1712187746; x=1712792546; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LYjXbKsZWObysa039N5fpdCtqQMANxENOQ8uS4k07nc=; b=jS6zYaWXE15siouAJcxVFmFBpp6audQYImo+Wq8lLAhqQ6sG8PnAmMDGVt52ePAVYv VcvyKlfABmHP1iiVhWLoaJCPiAVSImEAQwZzX2/N/Rt4kXRWzRqdV+0cEvo+vqN4PWkj NB+eT67sbcYhFa9GYICYbLpuyTWROUpIYWvMRf1x3cWuRzmar9Gg04WkqKIqEeC0ZmMn 1yJ7y/JFDvFm5YYejSR8n6omS7B3ikHl+G8pohf9WDDmI3HUvy2hXAuJ5es2jC6FxTCd Dpnm66pY3+2V31iNlPeFMhNADzj+jLM3zN56IVRxVEu4mIykUvKIHIw/KjYpcUjDyR5a gAjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712187746; x=1712792546; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LYjXbKsZWObysa039N5fpdCtqQMANxENOQ8uS4k07nc=; b=dobNRXKzoVV1t/xHcJVHB0K5cOOUUy9cV15iEZIOtkLMKPviVTpXgojTDXGBnGutLv xKvelbXxY92TscFff6FfFVpluFWyy3md7Wkts+myxkaic0hxGebdvx0wpXEONz80U/L3 6gEx7ra/+SQXrkybd0ZEvsoLJCACiMOPN+RaQz4ReHd6ZHDGrUT3z9VsL8HDD6uP5b+J yx5q/ec8RotuURNKg1Y+SBWIcWHfZfIp3MvR31X+baX2nRWWFf3PkUPVtpkQfYlBns97 gNEOrBsAHtuJvAxi0cBi+7qDyVE2awkDy9BJkfS2JRQJtKCnTAmIh258Cw0tUFAsOu4E mnMw== X-Forwarded-Encrypted: i=1; AJvYcCWZiMPHDisP1dyXV+d3ktatKF+2akD29nUJIc5CCjSUA/XlWTlqHlD4XGdk2EqaSXkPqjCoY5HP1X1h9pbGeuDOums= X-Gm-Message-State: AOJu0YzvRxeAoupcEcsqqP7qS/W8PFzt9w+X+edJ/qpo40NSELlpE998 yHD1wpr8ofOb3NOKwj87oieJmv1P2ykyKyEUvqQYDJglGnVvIASO3hxyHcRo29w= X-Google-Smtp-Source: AGHT+IGqtyBuB5j2we7P/N7XV7ZwjjMEdcimxTlF2S48pW5kJG8K4vLP5TYFGyEOra5BjXZZI2wVPA== X-Received: by 2002:a17:903:244d:b0:1e0:e85b:3389 with SMTP id l13-20020a170903244d00b001e0e85b3389mr1058260pls.3.1712187746310; Wed, 03 Apr 2024 16:42:26 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id b18-20020a170902d51200b001deeac592absm13899117plg.180.2024.04.03.16.42.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 16:42:17 -0700 (PDT) From: Deepak Gupta To: paul.walmsley@sifive.com, rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, kito.cheng@sifive.com, keescook@chromium.org, ajones@ventanamicro.com, conor.dooley@microchip.com, cleger@rivosinc.com, atishp@atishpatra.org, alex@ghiti.fr, bjorn@rivosinc.com, alexghiti@rivosinc.com, samuel.holland@sifive.com, conor@kernel.org Cc: linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, corbet@lwn.net, palmer@dabbelt.com, aou@eecs.berkeley.edu, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, Liam.Howlett@oracle.com, vbabka@suse.cz, lstoakes@gmail.com, shuah@kernel.org, brauner@kernel.org, debug@rivosinc.com, andy.chiu@sifive.com, jerry.shih@sifive.com, hankuan.chen@sifive.com, greentime.hu@sifive.com, evan@rivosinc.com, xiao.w.wang@intel.com, charlie@rivosinc.com, apatel@ventanamicro.com, mchitale@ventanamicro.com, dbarboza@ventanamicro.com, sameo@rivosinc.com, shikemeng@huaweicloud.com, willy@infradead.org, vincent.chen@sifive.com, guoren@kernel.org, samitolvanen@google.com, songshuaishuai@tinylab.org, gerg@kernel.org, heiko@sntech.de, bhe@redhat.com, jeeheng.sia@starfivetech.com, cyy@cyyself.name, maskray@google.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bgray@linux.ibm.com, mpe@ellerman.id.au, baruch@tkos.co.il, alx@kernel.org, david@redhat.com, catalin.marinas@arm.com, revest@chromium.org, josh@joshtriplett.org, shr@devkernel.io, deller@gmx.de, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com Subject: [PATCH v3 18/29] riscv: Implements arch agnostic shadow stack prctls Date: Wed, 3 Apr 2024 16:35:06 -0700 Message-ID: <20240403234054.2020347-19-debug@rivosinc.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240403234054.2020347-1-debug@rivosinc.com> References: <20240403234054.2020347-1-debug@rivosinc.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 73C7B40008 X-Rspam-User: X-Stat-Signature: xaufcckbj7zex8marnpkiguqoxdck64s X-Rspamd-Server: rspam01 X-HE-Tag: 1712187747-43584 X-HE-Meta: U2FsdGVkX19qfSjIyKr1PT9a9CHzVTbqzfarleimeYoYvK11m5OE1gIaXpb/br3/0iyiiLbclnXVFTl5ciQBA+1VmZbl7TLddtJ8zBA4mUX/2WA40cTpCtblbUqPFrPf7q96/Vtoa9FvKsZvD1Ixy8NPPwfn3CJptr7yy26r1TzvdHoAdeM6LaZgpEif32QIPENjRu+N0Ut8zmqk9kB7exc0edWnPsDEDoSPyylVwg0voVSB8xLU1Udr80bLDQwqw3T5zzFTI3znYdMK4rKohUOII/pSVhDluAGOefewxc6G7mdOyub58A7xdVcSHWDwOeAJRoGKUBoXrF83NqO/5S0aeHDt87+vn/uPHs3Ey9S3LRTqfgdVZDATddRP+ppQAv6tt8HOoOxmHnJtWCl/laLw+syw/lWTshfioootQaDmgsdWKnvGpOguebVRT1lZMDKRyfrN05iEfU+DtjNkZ6qvCHJq/Khs8fKANpTbf0TI1Sv7s6dwlepsZXeOn9CLJPbnGUUfURxBYpxSaWR+t8rsA9oX6Jn0fr/CXCR364RLeeoUvfbyoLSYDlMsvcrPd6iOW0HtGlH/56+o+3KB+EFpFgIw+QkpO4//H0tNVt3KuezFv/DOAobaU/LoFK6IlZmMfJ1dn2MdJgUV1HhFbxwsEp80stDCz+XZ9lsWOxrf6SlR2FJoUumwWDCYh9E6Ea4j5JJlSGQ01n07ICGN6tSOnXJ0OyGPVpfvMVGJHfEXNXqYxt2v20VaIag1Qo+9ALzKaFdiFzpoKqhrG0YR2kl4YMVtCkA+GZyvdmziz3mBelHDqBLkq3rmdJdHTXCSi2KR/UGv2I/4AxCD/5zit+gVppFhDHinFl94QKd1TKQaminTMDBBxiDevdBz0UcZsj40jUd331WmqooAEE3W4O3tTvOG2sQd3UXbPbIjd7zO8EySx2HNa/cG6+nuZjVHx/GKYlWsD/6baTd7crH 2CMJU2J9 BPSDhpZ7J/G21NSfNFeJx9yKkBgmIyFbAJQgL+U0sHzPTSEyYznZte/Tczvd6W1vUTSkScOIUcusBEe+5OomL7MKISaFq786WPUDKc9KEgJTtJ/DfVNqeCY/VS1Iu2rUzvxksxIUqHt4fORiMiNTjBy7pNxgyO/cf9TRYpvmSZ1B8+Tj1AFE3KtNA9TCR8oeuEhl5zwUuP9xc0nLZID9bXBffVnQBGdOJ8ddL4W02mEd78iA= 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 b47574a7a8c9..a168ae0fa5d8 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 */ @@ -26,6 +28,10 @@ void shstk_release(struct task_struct *tsk); void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, 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); +void set_shstk_status(struct task_struct *task, bool enable); + +#define PR_SHADOW_STACK_SUPPORTED_STATUS_MASK (PR_SHADOW_STACK_ENABLE) #else @@ -56,6 +62,16 @@ static inline bool is_shstk_enabled(struct task_struct *task) return false; } +static inline bool is_shstk_locked(struct task_struct *task) +{ + return false; +} + +static inline void set_shstk_status(struct task_struct *task, bool enable) +{ + +} + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index ef48a25b0eff..3fb8b23f629b 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -145,6 +145,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 11ef7ab925c9..cdedf1f78b3e 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_info.envcfg |= ENVCFG_SSE; + else + task->thread_info.envcfg &= ~ENVCFG_SSE; + + csr_write(CSR_ENVCFG, task->thread_info.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 @@ -268,3 +295,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)) + return -EINVAL; + + set_shstk_lock(task); + + return 0; +}