linux-kernel - [PATCH 3/5] x86/insn-eval: Remove regs arg from insn_get_modrm_rm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20251117093137.572132-4-jolsa@kernel.org>
Date: Mon, 17 Nov 2025 10:31:35 +0100
From: Jiri Olsa <jolsa@...nel.org>
To: Thomas Gleixner <tglx@...utronix.de>,
	Peter Zijlstra <peterz@...radead.org>
Cc: linux-kernel@...r.kernel.org,
	x86@...nel.org,
	Ingo Molnar <mingo@...nel.org>,
	Borislav Petkov <bp@...en8.de>,
	Dave Hansen <dave.hansen@...ux.intel.com>
Subject: [PATCH 3/5] x86/insn-eval: Remove regs arg from insn_get_modrm_rm_off

It's not used, insn_get_modrm_rm_off returns only offset to struct
pt_regs, not the actual register values.

Signed-off-by: Jiri Olsa <jolsa@...nel.org>
---
 arch/x86/coco/sev/vc-handle.c    | 2 +-
 arch/x86/include/asm/insn-eval.h | 2 +-
 arch/x86/kernel/cfi.c            | 2 +-
 arch/x86/kernel/umip.c           | 2 +-
 arch/x86/lib/insn-eval.c         | 5 ++---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/x86/coco/sev/vc-handle.c b/arch/x86/coco/sev/vc-handle.c
index f08c7505ed82..fd81bbbd8af6 100644
--- a/arch/x86/coco/sev/vc-handle.c
+++ b/arch/x86/coco/sev/vc-handle.c
@@ -467,7 +467,7 @@ static long *vc_insn_get_rm(struct es_em_ctxt *ctxt)
 	int offset;
 
 	reg_array = (long *)ctxt->regs;
-	offset    = insn_get_modrm_rm_off(&ctxt->insn, ctxt->regs);
+	offset    = insn_get_modrm_rm_off(&ctxt->insn);
 
 	if (offset < 0)
 		return NULL;
diff --git a/arch/x86/include/asm/insn-eval.h b/arch/x86/include/asm/insn-eval.h
index 6b592040bda4..500654d9eaeb 100644
--- a/arch/x86/include/asm/insn-eval.h
+++ b/arch/x86/include/asm/insn-eval.h
@@ -19,7 +19,7 @@ int pt_regs_offset(int regno);
 
 bool insn_has_rep_prefix(struct insn *insn);
 void __user *insn_get_addr_ref(struct insn *insn, struct pt_regs *regs);
-int insn_get_modrm_rm_off(struct insn *insn, struct pt_regs *regs);
+int insn_get_modrm_rm_off(struct insn *insn);
 int insn_get_modrm_reg_off(struct insn *insn, struct pt_regs *regs);
 unsigned long *insn_get_modrm_reg_ptr(struct insn *insn, struct pt_regs *regs);
 unsigned long insn_get_seg_base(struct pt_regs *regs, int seg_reg_idx);
diff --git a/arch/x86/kernel/cfi.c b/arch/x86/kernel/cfi.c
index 638eb5c933e0..3cf944cbd7ef 100644
--- a/arch/x86/kernel/cfi.c
+++ b/arch/x86/kernel/cfi.c
@@ -52,7 +52,7 @@ static bool decode_cfi_insn(struct pt_regs *regs, unsigned long *target,
 		return false;
 
 	/* Read the target address from the register. */
-	offset = insn_get_modrm_rm_off(&insn, regs);
+	offset = insn_get_modrm_rm_off(&insn);
 	if (offset < 0)
 		return false;
 
diff --git a/arch/x86/kernel/umip.c b/arch/x86/kernel/umip.c
index d432f3824f0c..7aeb405237ac 100644
--- a/arch/x86/kernel/umip.c
+++ b/arch/x86/kernel/umip.c
@@ -388,7 +388,7 @@ bool fixup_umip_exception(struct pt_regs *regs)
 	 * register.
 	 */
 	if (X86_MODRM_MOD(insn.modrm.value) == 3) {
-		reg_offset = insn_get_modrm_rm_off(&insn, regs);
+		reg_offset = insn_get_modrm_rm_off(&insn);
 
 		/*
 		 * Negative values are usually errors. In memory addressing,
diff --git a/arch/x86/lib/insn-eval.c b/arch/x86/lib/insn-eval.c
index 8b9c2b90d66e..71f58d437253 100644
--- a/arch/x86/lib/insn-eval.c
+++ b/arch/x86/lib/insn-eval.c
@@ -581,7 +581,7 @@ static int get_reg_offset_16(struct insn *insn, struct pt_regs *regs,
 
 	/* Operand is a register, use the generic function. */
 	if (X86_MODRM_MOD(insn->modrm.value) == 3) {
-		*offs1 = insn_get_modrm_rm_off(insn, regs);
+		*offs1 = insn_get_modrm_rm_off(insn);
 		*offs2 = -EDOM;
 		return 0;
 	}
@@ -849,7 +849,6 @@ int insn_get_code_seg_params(struct pt_regs *regs)
 /**
  * insn_get_modrm_rm_off() - Obtain register in r/m part of the ModRM byte
  * @insn:	Instruction containing the ModRM byte
- * @regs:	Register values as seen when entering kernel mode
  *
  * Returns:
  *
@@ -858,7 +857,7 @@ int insn_get_code_seg_params(struct pt_regs *regs)
  * cases, the returned value can be -EDOM to indicate that the particular value
  * of ModRM does not refer to a register and shall be ignored.
  */
-int insn_get_modrm_rm_off(struct insn *insn, struct pt_regs *regs)
+int insn_get_modrm_rm_off(struct insn *insn)
 {
 	return get_reg_offset(insn, REG_TYPE_RM);
 }
-- 
2.51.1