From patchwork Mon Mar 10 14:52:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010203 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 E6E1EC282EC for ; Mon, 10 Mar 2025 14:53:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 715C1280013; Mon, 10 Mar 2025 10:53:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A04B280011; Mon, 10 Mar 2025 10:53:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A6AE280013; Mon, 10 Mar 2025 10:53:07 -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 26D16280011 for ; Mon, 10 Mar 2025 10:53:07 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 82DF0B87D9 for ; Mon, 10 Mar 2025 14:53:07 +0000 (UTC) X-FDA: 83205934014.23.E58C6D6 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf07.hostedemail.com (Postfix) with ESMTP id 92B7240006 for ; Mon, 10 Mar 2025 14:53:05 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="OcHQSmJ/"; spf=pass (imf07.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 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=1741618385; 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=U3WBSuQtxCrqWO4AnVqRDRAjUKt9RcjlliTBkJ9pSIkGoVPNHCtrxNepUDvNfHpOU0lNDn bV+UuhlEq275VSQzFhDyhhjHZ4TkOooFJyW0nxaMBPN3jjz98pMex6KKgr4Dq3j2iNvsBN +Dimf1UcL03qH9Y/fefsfJxmIQMVOog= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618385; a=rsa-sha256; cv=none; b=YTPhf35/BJ8zmd0KJXwM6VTie2qFldUbkp3lYHqWmwKefY0LgIHBVRen08oEft0WVNcFap 5B81hYS1PmWeHMnz0SyGpT9Vdmh61J5Ottc9xO/beVJPu44dr/D1RraVPZiPBV4gm69446 hXvNWT4Ol1/WhWgLvBeJFlQn0CCXNSg= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="OcHQSmJ/"; spf=pass (imf07.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-22334203781so95786795ad.0 for ; Mon, 10 Mar 2025 07:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618384; x=1742223184; 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=OcHQSmJ/AUl47LYFWPlI7lGpYQcgh49BfxIQgxfeVExPOAMjUh2Njkru9zs+OZvYS7 EkK4s6Ld/eKpHgFR4QfegkwqroHPyuwaB7M/yff2EVBrcf1b6JTU7GZGgtrAlxUyOGEz MFwFyByh72pLTbUHU7p6EKFfhh/b2/+vOpEgcmfjH+ZoLiXdHjDQnLga1rT9jWOBM9DH H9xemj5LfGfaKFs9rSfJlsZp6X0XbC33h8KEOeI+HlRcmNpWqAI1DOF1V0tOb7q6E9jO Fo5+CErKgztNZQm/i8Qm0Xtrk3y5m2//lTrwhfKLdm9hAyDrFqVsH7gr0byFCPt1IweZ pUew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618384; x=1742223184; 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=p0gWkWQPGtH+IKS524I/+6Mv3PknhSsfMP189KwzMfkcocFHSNKUm0GFCVK2UXG14A nH5xPqwbBKoVlmk0o0Oxndxm2E9os/hkJGBL0oBWjT8y0A7gBiL4dqoqbrfvjzMGAfhj g6UQBNtBafLdyn3RJNL5h7fAUC2JJdV6NZ+hb+vqxl1DYjX5O/oh0eHC81ZYIhKXNxvg qjIH88Pv/yodxmymH++2f/hyOeu30oFjTIqBRelZBl0LN6yvC1FmFy3EH9vgkp9VoSEt uxf4AEywaLqf3Wv73i8mUWw2Sah8Vbo46j+0Kd1boT8yFd/q/qk/IYy2HQWaUsfUFUs1 Ed2A== X-Forwarded-Encrypted: i=1; AJvYcCUceQgXfAVRH4bv1XKcZvf34k7ZLwvwGiw1JwRCCuCZVCmvNBG8EkcB8PC+6Y8gIIikef1f7A0qZA==@kvack.org X-Gm-Message-State: AOJu0YwnbYEWprXiocIc4GF5TIVDYL2TQmJd4mzNxCcQ17jdrtmph35h 5JP9TCZRiqNDewZ/AeBvHX7TV2nWdIXC7xHt94KPrKBs252c0qJ2xFup5HbcI+g= X-Gm-Gg: ASbGncvj2zjUukA4WL1DOzI+45oEynpXQZ2uuBEaIx+icaPyMQlv1fd37BOi7DCeOps DUCu2KIo5MmbdblLPMKnX4nXGLobbF4A3ing1TK1P9r8WqL8Tdxc+pbXosLpbR5VNXo5ADDui+f i+RqYRLYtnwyrx1IzajXDEh4SD3UWukkl0Yhr8hKxQIQj46iLkxK7f6UCwqSE+mwwDTiYOoElQa cYEYOgNw0c7lqjD9mNkvX8af4WepfnClF20mGvrBkd0BHmzTFTsTpt3aCpEiln62RWLPeyqgwaE tZm6PHc3I1PJFpk0WlLXucxQU+Veq41FLo6HN2Wl7jhIn+ZsUHHhLy1v6iobj7acFw== X-Google-Smtp-Source: AGHT+IFPcCScpuJQuODEjO5ogKF+7rsG+dE6AGDUyxV2l5MZI+A8WNThCUXQtc0yXYjGKQnUtdvO1A== X-Received: by 2002:a05:6a00:13a5:b0:736:9f2e:1357 with SMTP id d2e1a72fcca58-736bc0d54eemr15283735b3a.12.1741618384358; Mon, 10 Mar 2025 07:53:04 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:04 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:35 -0700 Subject: [PATCH v11 13/27] prctl: arch-agnostic prctl for indirect branch tracking MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-13-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: 92B7240006 X-Stat-Signature: ym8i9nor7ebw8g3mfp1adgfdtzsznuut X-Rspamd-Server: rspam10 X-HE-Tag: 1741618385-881029 X-HE-Meta: U2FsdGVkX19fvx64OeaOY+USz/mTPlDjFSXGskOVEUMbDTrN96EL3oUdNJdYo48DTP7BNaTIzCY7gIk2l973ivZs7Xmsgxp7QVACuSjv/SVpsvglPDVeOjh3Z2yF+CjVqlTIBPa6rujD2BB2rtXLHa7OPwPzlI+mooPc2MPWXwLjsq5CnbQV1V42qDmmM9MAjcpphQ/tFtEOXn8ibtsKSm9TdFE5rtLeVD/iPdOlRQC1J21Ri6LH7G+EFeEe++kp+LgXK1JVsYsfaIJKUM+qjsqdOHrIZXlga4JmkrsMosvh8+9SjJPZAXGtFY6ryrFRkknmfIjETm+Y7GJIGcBWijZ8s76cIRLQQh4zroQ/JoiAOru8FqT4gFyXA3Zad5HtO4G1E5F+AO1GHjAaZTtfcYFwN5MeygiYVt8NPe9rDb7d3o1+cl38SHYFn/90iYQesoquVxiyP3Kp+nVXrFYkQSSl79Ixl9m1+kgd94VsrQHA4IA0zOUcZ1Zw7nRJuXQxRzMmUTUSLg7ua5tLLQpaNNc1xmnUS5Mgs9lSTBpK6YQKbwWOr6LVhwUnupTgrgz6qyW304R6xRHxOgR1dw83ealq4UmY3z/p7eLLSWU3NxLxDbQcNpIYPqtYDGnffhItii0AG5XN+vRhi/d9D63uXiDF+UANnx24z8twqI1i18c/SAKwkMCGmp96DTMxwoHNnQedMAwqcRhXrnSr8+8Eo3NIh7qntyv5t/yRhRYWIRsNDtewS9TIqEqU9ErXOmq/1RMp8QwTLqs87l8avm67/6YoMwuh0IfHObMGumuCEPsFcPBlOmfgRzeRLS7FRi+XoT/ayy+hoKdtezbm7UQXJV8BZZhgljf18hsUkweAVnWgm3iAUl5nwbUcJTiHR1LEae8GPKNs8DWccTTOZvCvvsYNwsf1xosYPFa1wnr+kRyIhoeb72ohbhKQP6ZgRrkld87y1qV0kG49ytv/Q+n aFGq7UMy XlAolPKeJstCDXgDNxW8okw2iFx0Cda1WugFIWA5lliIRAfq3kO9KpzWCiWQSqOaP6FAqLkhJj5DmIjOrR5fWKR9tQzIaKTiXsFobudINqi6rJCgL4lvK3RvpYWCdLFlV/AkQb9jPIomBwDLE70BCHxcEfWSHeV+iyaTcHci1l8eguH1DWTehOnvSp9sPpG1my3mNiIVM4niRZNKXknstLEyhCTBSWSWAatQ7BoZWm9eXd8Fkm9AzHgIeGuQWZQxIwqX8epSJLKdBwWXBm5V5upHCXPLgQ8tfpxqDBsNywqw91W+Yyg/fvNE/1eztBwB8z6mCQph+dcB5CzL1nQ+C4tVRvj+cs0OizKQ9LagXtuvEOIhEtqmrykhUnjXP0l9pDKObkzEKE7u2HIuokaMTLt2AB9RzeavJvALAaMVTUAhkPKIo8wJWmFu2BO5k6Ts9RKrxc1cq3J/2fzLSZgq8FPtb1KQFkS1asQP0TlOTDlOukpY= 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;