From patchwork Wed Feb 5 01:22:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960374 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 294F2C02193 for ; Wed, 5 Feb 2025 01:22:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB427280019; Tue, 4 Feb 2025 20:22:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A3956280016; Tue, 4 Feb 2025 20:22:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81672280019; Tue, 4 Feb 2025 20:22:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 5CD9D280016 for ; Tue, 4 Feb 2025 20:22:22 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1219B1605A9 for ; Wed, 5 Feb 2025 01:22:22 +0000 (UTC) X-FDA: 83084140524.26.ABB8B69 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by imf30.hostedemail.com (Postfix) with ESMTP id EB4698000B for ; Wed, 5 Feb 2025 01:22:19 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=D654WiHo; dmarc=none; spf=pass (imf30.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718540; a=rsa-sha256; cv=none; b=uH7CPTYbLgxwjYqQ7H+4zm2Tgk2RW7znYqR7qZ6bMqV5URUe56tQpEGfS+jkZ8wQVx5Dgg uM9PNPIeMD5zmw+je9sWw1luOqES2q3XVjLUAraFyvEarlysUbQRPRgfIGeJ0hhVUc4Udi UwKl9tZiaTeNNgPNUs/LpH1encj/O8w= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=D654WiHo; dmarc=none; spf=pass (imf30.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738718540; 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=QENQZmh4lxE2reEbTsOx4ZwimuJysJgcILrp4FFHskRnzeHGFDfb6TGRo95nZ7r1LEjN/I ErUVOdVYJajWmoMFvymap32cmYehAB76ToxgMBjvEOJy8G0u3+kmfnCV7zny06AhAbDP3l 1j24ib+uxvcgX6QVOJCaSSLijf9ejcU= Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2f9cb23d22cso1694885a91.1 for ; Tue, 04 Feb 2025 17:22:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718539; x=1739323339; 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=D654WiHolK5rp5cu/+19v0Q8LqsBTX15+MjT64hjpOUpFg73yKZ60wX/q5rHif2SsL O29Y9OAmcjlXeVOV+3wB8L62chWArPIWWt3Hb6klXC4YACKlqgJFZ00+55ZIgK7vUB0Z ME0TwEOXqfus0BaiStEJ8ThKO9HE9SSQtveBIFZvHPlM4sWvmORkx6lBws+7kYLovqWQ iEq1vghTFb2SG6eIDCgUayw+N7GOBCRR+C1IP3bJ35fV8nrPcZgLrRVzW6SY+LOYiOyb kKD27j0gTH6JsinoYnsqILq1KQnh86D1ge99pjxlrkIMaMbzdH9UgqG4g5XUAEQGNYZg I9Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718539; x=1739323339; 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=XS6ZLxsBXlknCCQCNcFWc6WwTC4/4nBtrHZoJi02ZVW3DIlEVbww7y6he5/TaE0nhW y87fMFquhqQ7V3f/6RDY0i2nosg5QSSv9L2h2Vhyyk46u6c0SuRetsOnPY793fMcc8m6 YNhgqM7nKnghEFZaMaXkXV0cmzMXZlNyCnuoAAXlSxcXBJ2R+u2ZfANer+sYKBh+u8q9 a6RibLNmy6cPVoTVeeAcX+daOqvvaI6ajen+ZhwXXcILS89fzflPez2o4fiPJYm7Fn6y IKD0FymWPikQn7BC4aR//zXOI0M2RrpcAsds1A4e4zb2N53Ei+xk1L+0soemIDfIHj+c SqbA== X-Forwarded-Encrypted: i=1; AJvYcCVc4y/tk+OrMWjLYeHjWRP+kQy8KwpqQSCVT0WrVDy7Lnq4PFbDEU+p9kRuVX+VrG7fTYNwNMsXyQ==@kvack.org X-Gm-Message-State: AOJu0Yyth7hmx2KCDsEWLCh8XZjFgQ9Vt4Hgdl+Gxu4VpccMgs8h0bZt PIdvQhn0AukzOv7QY23jaumhsnndlx6hMskCgEylNjPX7iOCF1eglbX4TagpM6w= X-Gm-Gg: ASbGncsJBXdlE2qr32ssSYZLBbfsthY5LioXTtkMPIMvUZyZXkxDYD3ihrCym5rJNdn 0e/z0qk9118dqEeLb705SIr9cyUJsrmdYeJo9e8RpezpKikpaM9L0ifiQSsjBIpBTTL9p+owrvs 3r7tp06uuq1dy4NLn3TdPNcVV9yZJb4IfH1tUIYl8ap7z2k30bhBpenRET7HE1grL1STi70hJ70 Rsktj2nxkewwop4CbRyGSbiJQmyNpinyjPpodprNUuUyZttheEIR+6PCzq3ZeLJmBNSGneNIYP+ Pg+ZGq0ClIElsvhwdpjqcGuJvw== X-Google-Smtp-Source: AGHT+IEkMV3NZQlTfgqHebic0yhy4xKkC1OVABBD14xN7hIjWbNvTWOJifhfgskqBrlP8VDgH29eiw== X-Received: by 2002:a05:6a00:2886:b0:729:1b8f:9645 with SMTP id d2e1a72fcca58-7303521c6d7mr1821327b3a.24.1738718538832; Tue, 04 Feb 2025 17:22:18 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69cec0fsm11457202b3a.137.2025.02.04.17.22.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:18 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:00 -0800 Subject: [PATCH v9 13/26] prctl: arch-agnostic prctl for indirect branch tracking MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-13-b37a49c5205c@rivosinc.com> References: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@rivosinc.com> In-Reply-To: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@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: EB4698000B X-Rspamd-Server: rspam10 X-Stat-Signature: m9i3x7hesgogwd5ns1sr1ebp9ydax73g X-HE-Tag: 1738718539-927168 X-HE-Meta: U2FsdGVkX19W9OapzOD4zPGBk0ipnXMDUpmurxqrewzSPfghtXbHBEDa6vGcDIQ77TRt3VhH2aOeRnq1uBZWtmAyiCObZOAKtxiukylnwy4UDBspCut4pk341ca0jRVjU/FqVTqCEdwPiHBHDWD3LIpOLD3MNUNjdOmkC3cdmKqeAo44/OmCbsD7SnmPRX95Acv2sE+X6CS8mso04RfBlRuWK7C22u8gwxiwysbHwmX2WUut5ziCeXYDDJSl+d4Tlyj0P3A/0LxmaKQn+tSLljLdcqwzyemZ/WHdGY+OGwM1mp6qfzDmr9lx0RKx/i+UetXcP4xPCkyWmypQf1BKvrCho+8634PbkG4XW/yhGgZEg/EE7T7BfMHOyRqWqavg1guMJfdtHRd4dYOkYmfuVvBUz7VWQmRsJ20pbhcyeWZSyVH/VEBTZGnClG+1C+SjBwUESthRikmmgAU/7qZnsPcBSKpJeeAmI4FkbBT/eXyPjeAI3FHR+kEuwOfJNOXb52KGxkkXmk8IrBNd1yyz0Hmpp2iG53D/rvmmSnuQI4D5IlGltMZ/cq6URTVu0YEM1wDhzisokzxUJoOhbVfcprUJO4QBqJ1v9b72RsgKKjFoZK3FrKVbliF8zmxxWUGTXYy2ozMDJO9oRM2yi10sg+W+v+hiHlkRWM5NRBnNyafrz6x2gXAH1aNiV5oQ6mTOGUsolYHU1W0z2NZPiICR4km85kkrpvFfdUAooBxcXt01gcokpeIfhdhZOa32rikbfTkxqsQmtzLCDna1zdhM7sCKOL0QCLSC8A0oPjOuYxmKcZY0rS9NnXPFivdvBH8EB2Z/mJ75CeKljMObZaTgMgpGUqY2GW1CFpCbeabDU3ApKLiPEgOJphqZCnQNF+bWHfzlFM05bDRKJxvSrXc/SS24yUKXSCQTxiVI5Jkzz52gRipnfWX/QCYEiveXVvIO2AMeeCt72ghwr+l2WYW oQqCHbhf 1VBLgxji9c1yW/h1Wk4NXbPv8ZeQ/7SLs4UBtvqry1h9RMN8A3MBt4Sbx26G6n6LAX9XnE+RoFOzEEin/lA/WeZOjyb90gIgzwO7V65BRe07jLSA73FHNXNrZc9fDmCWywtPn82yqOTNMCDhnEYUmA7JItsvDJyQdhVzvLQsBhGApWZ8BXznR5aSy0PWTKX0GJHAPLOM/OrXKjvK+amIIkVeNfW07EPyiJmSf0dqqVF7HCKG4n2J67KuUiTYx/AftaxPTEbVEi+DavDDVea+BCpFaby4AU8da3XE37i8nOmaZqpHyWCnODwb8MNHvqu0ugFh3fO3llwXvvK3AuqT8kxmIo6figfThDEJj7EW/dX/dY8KcYXu/7qmqsNG4Q34smi9VQpb1eLRxTB1j2ETshzjk9xEcl38sejvzKlMPUJUhO0icLBaZA5aKBNi5O+S0k5D0UmAvHXsExogLN+VVfnt8ILx5zjMmWbNuanXJBjKRLyQ= 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;