From patchwork Mon Feb 10 20:26:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968609 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 90F78C021A1 for ; Mon, 10 Feb 2025 20:27:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14AD0280020; Mon, 10 Feb 2025 15:27:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E3DC28001E; Mon, 10 Feb 2025 15:27:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1851280020; Mon, 10 Feb 2025 15:27:17 -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 B90D728001E for ; Mon, 10 Feb 2025 15:27:17 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8264F1605CF for ; Mon, 10 Feb 2025 20:27:17 +0000 (UTC) X-FDA: 83105169714.09.3B2CA83 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf22.hostedemail.com (Postfix) with ESMTP id 8B906C000E for ; Mon, 10 Feb 2025 20:27:15 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=z5Q5O8Dv; spf=pass (imf22.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=1739219235; 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=n4wOXS0/20DvZRxruHD7mFnd6lRzln/dV2wTFJ6STYc=; b=MG8ezcZAlnGXaJxiwmUt5Cys/V5qAT7qBNqAf82yZWTLDm1vvvOGm0HKAew3sTWFnZugJb /7FGWje80N6eSol2JLDpq6PjpvKjGhW9LX0cUJwCwhRaTfqWzfw/qKrrklC4me1hxcIfGB 8S+jTZ7tssAry1nMaze/k5Q/pBTXmTE= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=z5Q5O8Dv; spf=pass (imf22.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=1739219235; a=rsa-sha256; cv=none; b=5G8ATBqBbHOEbcqABcDR1oH0AZr4T0NRcmE2gqoOYmMZ2v90g5k5EcltUngZcbM4K4+e1C xOOH0Se1UyJS0OfyezBmXWwgXNDLGMOQ2cG9Howrv4ksnwOwyDiu62dt9U0v69v6m+h9Eu kxjYa+jzBqf6dC2Rov0nB4ACicEk3gw= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21f3e2b4eceso90257875ad.2 for ; Mon, 10 Feb 2025 12:27:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219234; x=1739824034; 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=n4wOXS0/20DvZRxruHD7mFnd6lRzln/dV2wTFJ6STYc=; b=z5Q5O8DvxzIc/h/Lyi8FW/FwLDb4Pel3tBtIJ7g9BvjpUgjJyJB61Mv41V24hrxaFG Xzp2cnH5lC8/RctgWzc/f/1KawV2G+AkpNkOG5eIvIZgQst32nBEm6qxAMVyrE6ivNEw NEvB5+ql86Ist+8gTOXeVbiB2zspfOfAl5Am2yTPO/W4oL32R0ffmKftSes0ZjBeT1QY QL+D9T2mAEK4WPdzRiBSQBU/BEVue60Dztk1xDR8HpjRWLkhoB4+IrZwzehUsFOu6KmX Q2eMqZ+vWScdDQ37aecxpc8k8R6WtZvQHRTsR8Tjl+J69Q0UiHXQVDLYBbXe9pV9TmxF DRYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219234; x=1739824034; 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=n4wOXS0/20DvZRxruHD7mFnd6lRzln/dV2wTFJ6STYc=; b=QEVIbQ4cV82eIogCpIsyCiOmTgAgPenatewqflL579O5w/gITNeujRVfagJxSfI6Ba mwt0E0Qwi5fVkqS/4ldsuKNlZM/1zSGEeoU6+qjl+cAs2m4yBpvmtHB7ncXG1tLtQZlO COz2TGm99wJxX/t5Urk1fosLB6v6wrA66kQakvk4kITxUPaA0xnwmpmf/QNw/LDqsQt7 EhMrA4AeckA4RS5OsxItfvP37a+D0leCoaILUGpDUq3gQdLg0v4P3hEoehLEAJAaiPfN MaEy/1879IuG9Dssc2KtQLuk/D4QuD/Zuf+5qIht86/gv/LX54XMCoU655duOC5S/eJd z/FQ== X-Forwarded-Encrypted: i=1; AJvYcCXShZ61593aLSNh63s1FF8q1eSulBCZlqpVtELzA9WaZus6gwTEFxs0aa/9Zo8rNVvzR+2Oo8fUhA==@kvack.org X-Gm-Message-State: AOJu0Yx+sS27Z6T3Xh49rFlKjpKig9nwHQWY4D/HRYKXpumtZOn4ChVo JDfIxhHOCYWyiRLp0EzL+N6Byq9zWlPQ96tNhBWaNYdBtiwHt6x5AMgb1bwiH10= X-Gm-Gg: ASbGnctKxfoA/yiPHhaHL9ZRSjdMtjTaDDRESEf4L+xUA5eZnfEh4UKzktx1xBPXM3H cwLQDQRJajWNGnILmFb/b1X8W8gjJUbLFN7iza846C0+RSwsMnzd/dCgQi/+te1A6C3bXZvFKS5 lCISPM8fB7Jwi0lFnuIv5Vv7cikRaVsXCyRANKM/5N1gU3zh3T71WXfpg+EW6aYjCMZH7RNtRt/ OfJX0HJkNP+kr7LhnW3DXprcLXP5AovzxC7AjyhnszJXXuPtY/pBRRCXbBavj4NsMC215E6wLZU 3iMuCWzh95D+Rat7jg9K3jwDpQ== X-Google-Smtp-Source: AGHT+IF/ji7Q2jsk3glAmrvkgQ8qeyspiS6WaI2wICDLM2NlYpH7cnCIzarKdjCUYb/eofkHRWzaPA== X-Received: by 2002:a17:902:e946:b0:216:69ca:770b with SMTP id d9443c01a7336-21f4e6bc5c3mr267481085ad.12.1739219234469; Mon, 10 Feb 2025 12:27:14 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:27:14 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:46 -0800 Subject: [PATCH v10 13/27] prctl: arch-agnostic prctl for indirect branch tracking MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-13-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-Queue-Id: 8B906C000E X-Stat-Signature: f7s3q37z8jmr3xiaqs46nw6g4sfu64s9 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1739219235-46657 X-HE-Meta: U2FsdGVkX190p7yjn0cm/k1WMykjXh8sQrcWkUsjGLqw+E70BzHYw/18o3ZxhzMfl0fyE8cYL2aF/rb/nnx9wufhFIQivkK87nKyO98aRwCoV67XUJ3Q2+wLGUZZbZebL2kI8Nc84wozMxnPGp8sNZX30mDPDlB7WKbE7HhRwnZZ91CHBTlNcKd9m6Fa9fh7GxPA7iEFSq9JgFrFWNmF9Y8dNRqra60AlkpvZ45xdQpUoUFcWYHo0d6yi2VDhX6E4dclNIKs10F0HW1AM+K3XEdVUrIWHK9Tey03VK4nuoV8b0SbcOMlORECL1SEMfpt2YcxVGHE5RlgFMjLHnV4VGPU/F79dkeUlitDkrt3eiKB0gXpYs7ZAfHGIx4FvtP/QN7q88uTRpwDaIg30alJpTJjO3ntici8oo+5q3Dm+BTW9ULA2RZhjZmX3RdOpKydb2Sn4q4/P/LCZj81mhrP5AvoW1PcK41DwTy0iTNbVVd0Vfb9GIaulWS1TMs9Y+XW+f4mja24mEMRkaTk9wq1/nH2mtfoWSwgg2T77ISLSLQBNISQcYgfM3C/htJBzEPM741ycZ61R19DwkkS1Au33uVZnjiUxYxJz1NLNod5uXMTZwmUPA1nyVMJZZuXe5VETmKRp3zqgnRyjmLwSCl7CvqDzBM259YGqx3e+vzOlHL/yD73Uc0c2LWOfMvCoCOL/2QrwlBqJmP1DKpDJUPS5cFMtWfetOPjy2HcFcYp10Hs9qq2BthhH4NMI9/qBH2wrG/YAW/GG8Lbom3gqN6pluDxnSE5B3AEWNNNF02OOeHq+4MODngluSNiYQNjaei2KUgDBt/rTCSMDYwGpZne79JSXS5fwEqMo333HywYVjNZd920ijM0RmT1hoC9jWDaPdGZzzlxBV6/M0dXEsercc7NTQsTdUb0BBkv7bdWQ5mBv3eIJ3W4lfgggkbt54dI5/WgeznPZnjYt7E/8IF ou4Q1gmM XfC8cd4d3MG8aylT5qdPSrGXroQsCrjOt24CJzhcKrdOg0uEcOpqe/aUe6/50GpWB4bOKikFQKUbwQ8wWTnTBEb4SY0Jy9hP2XCzWhSO5CF/MlLuFj2MQwKYt2BY/RotIHQgYZ5YOfhu5R5fSJ8bGicv8r/A7UAPo8/IxttRaOzrzcufVhd11DAywXSn7KfKVr9r5MJnfIisRJaIDUulCK3apSwlAtYWI4vDgyh9xvs65WvbFWhhmQYTSr0zR51umvo5RBKk+q8Bxd+3kzH3cE38ECP1wxBK0fmCsRTldDkkft9U76Bsgo37gm+k5PyMBHUgj42OgfpC78yURgkVWmi15W6zdGd8747lItUEIUs2FF+Xzf5fWrllQ9u5rtARcNROMZuYcyb5qU+H21m7IRWicPAkmnpqlV1crbylSaPM88tqI8OFzYFCJXiNHdbcIw/ovBck8r5e6ISg/NKH2ddtOKa+nGIx3RR3R6t8cPoFHFxI= 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: Three architectures (x86, aarch64, riscv) have support for indirect branch tracking feature in a very similar fashion. On a very high level, indirect branch tracking is a CPU feature where CPU tracks branches which uses memory operand to perform control transfer in program. As part of this tracking on indirect branches, CPU goes in a state where it expects a landing pad instr on target and if not found then CPU raises some fault (architecture dependent) x86 landing pad instr - `ENDBRANCH` aarch64 landing pad instr - `BTI` riscv landing instr - `lpad` Given that three major arches have support for indirect branch tracking, This patch makes `prctl` for indirect branch tracking arch agnostic. To allow userspace to enable this feature for itself, following prtcls are defined: - PR_GET_INDIR_BR_LP_STATUS: Gets current configured status for indirect branch tracking. - PR_SET_INDIR_BR_LP_STATUS: Sets a configuration for indirect branch tracking. Following status options are allowed - PR_INDIR_BR_LP_ENABLE: Enables indirect branch tracking on user thread. - PR_INDIR_BR_LP_DISABLE; Disables indirect branch tracking on user thread. - PR_LOCK_INDIR_BR_LP_STATUS: Locks configured status for indirect branch tracking for user thread. Signed-off-by: Deepak Gupta Reviewed-by: Mark Brown --- arch/riscv/include/asm/usercfi.h | 16 ++++++++- arch/riscv/kernel/entry.S | 2 +- arch/riscv/kernel/process.c | 5 +++ arch/riscv/kernel/usercfi.c | 76 ++++++++++++++++++++++++++++++++++++++++ include/linux/cpu.h | 4 +++ include/uapi/linux/prctl.h | 27 ++++++++++++++ kernel/sys.c | 30 ++++++++++++++++ 7 files changed, 158 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index c4dcd256f19a..a8cec7c14d1d 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -16,7 +16,9 @@ struct kernel_clone_args; struct cfi_status { unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ unsigned long ubcfi_locked : 1; - unsigned long rsvd : ((sizeof(unsigned long) * 8) - 2); + unsigned long ufcfi_en : 1; /* Enable for forward cfi. Note that ELP goes in sstatus */ + unsigned long ufcfi_locked : 1; + unsigned long rsvd : ((sizeof(unsigned long) * 8) - 4); 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 */ @@ -33,6 +35,10 @@ 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); +bool is_indir_lp_enabled(struct task_struct *task); +bool is_indir_lp_locked(struct task_struct *task); +void set_indir_lp_status(struct task_struct *task, bool enable); +void set_indir_lp_lock(struct task_struct *task); #define PR_SHADOW_STACK_SUPPORTED_STATUS_MASK (PR_SHADOW_STACK_ENABLE) @@ -58,6 +64,14 @@ void set_shstk_status(struct task_struct *task, bool enable); #define set_shstk_status(task, enable) +#define is_indir_lp_enabled(task) false + +#define is_indir_lp_locked(task) false + +#define set_indir_lp_status(task, enable) + +#define set_indir_lp_lock(task) + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 68c99124ea55..00494b54ff4a 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -143,7 +143,7 @@ SYM_CODE_START(handle_exception) * Disable the FPU/Vector to detect illegal usage of floating point * or vector in kernel space. */ - li t0, SR_SUM | SR_FS_VS + li t0, SR_SUM | SR_FS_VS | SR_ELP REG_L s0, TASK_TI_USER_SP(tp) csrrc s1, CSR_STATUS, t0 diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index cd11667593fe..4587201dd81d 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -160,6 +160,11 @@ void start_thread(struct pt_regs *regs, unsigned long pc, set_shstk_status(current, false); set_shstk_base(current, 0, 0); set_active_shstk(current, 0); + /* + * disable indirect branch tracking on exec. + * libc will enable it later via prctl. + */ + set_indir_lp_status(current, false); #ifdef CONFIG_64BIT regs->status &= ~SR_UXL; diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 37d6fb8144e7..3a66f149a4ef 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -69,6 +69,32 @@ void set_shstk_lock(struct task_struct *task) task->thread_info.user_cfi_state.ubcfi_locked = 1; } +bool is_indir_lp_enabled(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ufcfi_en ? true : false; +} + +bool is_indir_lp_locked(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ufcfi_locked ? true : false; +} + +void set_indir_lp_status(struct task_struct *task, bool enable) +{ + task->thread_info.user_cfi_state.ufcfi_en = enable ? 1 : 0; + + if (enable) + task->thread.envcfg |= ENVCFG_LPE; + else + task->thread.envcfg &= ~ENVCFG_LPE; + + csr_write(CSR_ENVCFG, task->thread.envcfg); +} + +void set_indir_lp_lock(struct task_struct *task) +{ + task->thread_info.user_cfi_state.ufcfi_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 @@ -369,3 +395,53 @@ int arch_lock_shadow_stack_status(struct task_struct *task, return 0; } + +int arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *status) +{ + unsigned long fcfi_status = 0; + + if (!cpu_supports_indirect_br_lp_instr()) + return -EINVAL; + + /* indirect branch tracking is enabled on the task or not */ + fcfi_status |= (is_indir_lp_enabled(t) ? PR_INDIR_BR_LP_ENABLE : 0); + + return copy_to_user(status, &fcfi_status, sizeof(fcfi_status)) ? -EFAULT : 0; +} + +int arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status) +{ + bool enable_indir_lp = false; + + if (!cpu_supports_indirect_br_lp_instr()) + return -EINVAL; + + /* indirect branch tracking is locked and further can't be modified by user */ + if (is_indir_lp_locked(t)) + return -EINVAL; + + /* Reject unknown flags */ + if (status & ~PR_INDIR_BR_LP_ENABLE) + return -EINVAL; + + enable_indir_lp = (status & PR_INDIR_BR_LP_ENABLE) ? true : false; + set_indir_lp_status(t, enable_indir_lp); + + return 0; +} + +int arch_lock_indir_br_lp_status(struct task_struct *task, + unsigned long arg) +{ + /* + * If indirect branch tracking is not supported or not enabled on task, + * nothing to lock here + */ + if (!cpu_supports_indirect_br_lp_instr() || + !is_indir_lp_enabled(task) || arg != 0) + return -EINVAL; + + set_indir_lp_lock(task); + + return 0; +} diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 6a0a8f1c7c90..fb0c394430c6 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -204,4 +204,8 @@ static inline bool cpu_mitigations_auto_nosmt(void) } #endif +int arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *status); +int arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status); +int arch_lock_indir_br_lp_status(struct task_struct *t, unsigned long status); + #endif /* _LINUX_CPU_H_ */ diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h index 5c6080680cb2..6cd90460cbad 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h @@ -353,4 +353,31 @@ struct prctl_mm_map { */ #define PR_LOCK_SHADOW_STACK_STATUS 76 +/* + * Get the current indirect branch tracking configuration for the current + * thread, this will be the value configured via PR_SET_INDIR_BR_LP_STATUS. + */ +#define PR_GET_INDIR_BR_LP_STATUS 77 + +/* + * Set the indirect branch tracking configuration. PR_INDIR_BR_LP_ENABLE will + * enable cpu feature for user thread, to track all indirect branches and ensure + * they land on arch defined landing pad instruction. + * x86 - If enabled, an indirect branch must land on `ENDBRANCH` instruction. + * arch64 - If enabled, an indirect branch must land on `BTI` instruction. + * riscv - If enabled, an indirect branch must land on `lpad` instruction. + * PR_INDIR_BR_LP_DISABLE will disable feature for user thread and indirect + * branches will no more be tracked by cpu to land on arch defined landing pad + * instruction. + */ +#define PR_SET_INDIR_BR_LP_STATUS 78 +# define PR_INDIR_BR_LP_ENABLE (1UL << 0) + +/* + * Prevent further changes to the specified indirect branch tracking + * configuration. All bits may be locked via this call, including + * undefined bits. + */ +#define PR_LOCK_INDIR_BR_LP_STATUS 79 + #endif /* _LINUX_PRCTL_H */ diff --git a/kernel/sys.c b/kernel/sys.c index cb366ff8703a..f347f3518d0b 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2336,6 +2336,21 @@ int __weak arch_lock_shadow_stack_status(struct task_struct *t, unsigned long st return -EINVAL; } +int __weak arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *status) +{ + return -EINVAL; +} + +int __weak arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status) +{ + return -EINVAL; +} + +int __weak arch_lock_indir_br_lp_status(struct task_struct *t, unsigned long status) +{ + return -EINVAL; +} + #define PR_IO_FLUSHER (PF_MEMALLOC_NOIO | PF_LOCAL_THROTTLE) #ifdef CONFIG_ANON_VMA_NAME @@ -2811,6 +2826,21 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, return -EINVAL; error = arch_lock_shadow_stack_status(me, arg2); break; + case PR_GET_INDIR_BR_LP_STATUS: + if (arg3 || arg4 || arg5) + return -EINVAL; + error = arch_get_indir_br_lp_status(me, (unsigned long __user *)arg2); + break; + case PR_SET_INDIR_BR_LP_STATUS: + if (arg3 || arg4 || arg5) + return -EINVAL; + error = arch_set_indir_br_lp_status(me, arg2); + break; + case PR_LOCK_INDIR_BR_LP_STATUS: + if (arg3 || arg4 || arg5) + return -EINVAL; + error = arch_lock_indir_br_lp_status(me, arg2); + break; default: trace_task_prctl_unknown(option, arg2, arg3, arg4, arg5); error = -EINVAL;