x86: Add insn_decode_kernel()

Add a helper to decode kernel instructions; there's no point in
endlessly repeating those last two arguments.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210326151259.379242587@infradead.org

diff --git a/arch/x86/include/asm/insn.h b/arch/x86/include/asm/insn.h
index f03b6ca7dec6c416ef5c8651efb08ab8d3ca2e42..05a6ab940f452d48944262c70aba0d8bf663d954 100644 (file)
--- a/arch/x86/include/asm/insn.h
+++ b/arch/x86/include/asm/insn.h
@@ -150,6 +150,8 @@ enum insn_mode {
 
 extern int insn_decode(struct insn *insn, const void *kaddr, int buf_len, enum insn_mode m);
 
+#define insn_decode_kernel(_insn, _ptr) insn_decode((_insn), (_ptr), MAX_INSN_SIZE, INSN_MODE_KERN)
+
 /* Attribute will be determined after getting ModRM (for opcode groups) */
 static inline void insn_get_attribute(struct insn *insn)
 {

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index ce28c5c1deba218a8edf98b2ac0b93865190d835..ff359b3a30e79e08df2824ba3c1880366adef046 100644 (file)
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -1280,7 +1280,7 @@ static void text_poke_loc_init(struct text_poke_loc *tp, void *addr,
        if (!emulate)
                emulate = opcode;
 
-       ret = insn_decode(&insn, emulate, MAX_INSN_SIZE, INSN_MODE_KERN);
+       ret = insn_decode_kernel(&insn, emulate);
 
        BUG_ON(ret < 0);
        BUG_ON(len != insn.length);

diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c
index a2136ced9d738b7ffb3ee35abea9f8a1c7476e4d..abdd2e40d7c4fe0f005db352585b3cfcf67a49b0 100644 (file)
--- a/arch/x86/kernel/cpu/mce/severity.c
+++ b/arch/x86/kernel/cpu/mce/severity.c
@@ -225,7 +225,7 @@ static bool is_copy_from_user(struct pt_regs *regs)
        if (copy_from_kernel_nofault(insn_buf, (void *)regs->ip, MAX_INSN_SIZE))
                return false;
 
-       ret = insn_decode(&insn, insn_buf, MAX_INSN_SIZE, INSN_MODE_KERN);
+       ret = insn_decode_kernel(&insn, insn_buf);
        if (ret < 0)
                return false;
 

diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index dd0902184708476591e9077de78a07490a00b54f..1319ff47c85c01dbc02811d911439b6e426d2554 100644 (file)
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -285,7 +285,7 @@ static int can_probe(unsigned long paddr)
                if (!__addr)
                        return 0;
 
-               ret = insn_decode(&insn, (void *)__addr, MAX_INSN_SIZE, INSN_MODE_KERN);
+               ret = insn_decode_kernel(&insn, (void *)__addr);
                if (ret < 0)
                        return 0;
 
@@ -322,7 +322,7 @@ int __copy_instruction(u8 *dest, u8 *src, u8 *real, struct insn *insn)
                        MAX_INSN_SIZE))
                return 0;
 
-       ret = insn_decode(insn, dest, MAX_INSN_SIZE, INSN_MODE_KERN);
+       ret = insn_decode_kernel(insn, dest);
        if (ret < 0)
                return 0;
 

diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
index 4299fc86573217cea8637dcbdd0aac8b6b390cb1..71425ebba98a151c191311b66d964f7be25e984b 100644 (file)
--- a/arch/x86/kernel/kprobes/opt.c
+++ b/arch/x86/kernel/kprobes/opt.c
@@ -324,7 +324,7 @@ static int can_optimize(unsigned long paddr)
                if (!recovered_insn)
                        return 0;
 
-               ret = insn_decode(&insn, (void *)recovered_insn, MAX_INSN_SIZE, INSN_MODE_KERN);
+               ret = insn_decode_kernel(&insn, (void *)recovered_insn);
                if (ret < 0)
                        return 0;
 

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index a5d254057b88d5f285e0c84c85f3ff48312516f2..034f27fc230a41b58eb8e81dbfabcece7100ea33 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -504,7 +504,7 @@ static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs,
                        MAX_INSN_SIZE))
                return GP_NO_HINT;
 
-       ret = insn_decode(&insn, insn_buf, MAX_INSN_SIZE, INSN_MODE_KERN);
+       ret = insn_decode_kernel(&insn, insn_buf);
        if (ret < 0)
                return GP_NO_HINT;
 

diff --git a/tools/arch/x86/include/asm/insn.h b/tools/arch/x86/include/asm/insn.h
index c9f3eeebb53be6f0e57ae61a5d64c086055be012..dc632b41f1356960495f2cb158ba0c2c072f96ca 100644 (file)
--- a/tools/arch/x86/include/asm/insn.h
+++ b/tools/arch/x86/include/asm/insn.h
@@ -150,6 +150,8 @@ enum insn_mode {
 
 extern int insn_decode(struct insn *insn, const void *kaddr, int buf_len, enum insn_mode m);
 
+#define insn_decode_kernel(_insn, _ptr) insn_decode((_insn), (_ptr), MAX_INSN_SIZE, INSN_MODE_KERN)
+
 /* Attribute will be determined after getting ModRM (for opcode groups) */
 static inline void insn_get_attribute(struct insn *insn)
 {