Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93c08089 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/mpx' into x86/asm, to pick up dependent commits 



The UMIP series is based on top of changes already queued up in the x86/mpx branch,
so merge it.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 9275b933 71271269

arch/x86/include/asm/inat.h

+10 −0
Original line number Diff line number Diff line
@@ -97,6 +97,16 @@ 
#define INAT_MAKE_GROUP(grp)	((grp << INAT_GRP_OFFS) | INAT_MODRM)

#define INAT_MAKE_IMM(imm)	(imm << INAT_IMM_OFFS)



/* Identifiers for segment registers */

#define INAT_SEG_REG_IGNORE	0

#define INAT_SEG_REG_DEFAULT	1

#define INAT_SEG_REG_CS		2

#define INAT_SEG_REG_SS		3

#define INAT_SEG_REG_DS		4

#define INAT_SEG_REG_ES		5

#define INAT_SEG_REG_FS		6

#define INAT_SEG_REG_GS		7



/* Attribute search APIs */

extern insn_attr_t inat_get_opcode_attribute(insn_byte_t opcode);

extern int inat_get_last_prefix_id(insn_byte_t last_pfx);

arch/x86/include/asm/insn-eval.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_INSN_EVAL_H

#define _ASM_X86_INSN_EVAL_H

/*

 * A collection of utility functions for x86 instruction analysis to be

 * used in a kernel context. Useful when, for instance, making sense

 * of the registers indicated by operands.

 */



#include <linux/compiler.h>

#include <linux/bug.h>

#include <linux/err.h>

#include <asm/ptrace.h>



#define INSN_CODE_SEG_ADDR_SZ(params) ((params >> 4) & 0xf)

#define INSN_CODE_SEG_OPND_SZ(params) (params & 0xf)

#define INSN_CODE_SEG_PARAMS(oper_sz, addr_sz) (oper_sz | (addr_sz << 4))



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);

unsigned long insn_get_seg_base(struct pt_regs *regs, int seg_reg_idx);

char insn_get_code_seg_params(struct pt_regs *regs);



#endif /* _ASM_X86_INSN_EVAL_H */

arch/x86/kernel/uprobes.c

+9 −6
Original line number Diff line number Diff line
@@ -271,12 +271,15 @@ static bool is_prefix_bad(struct insn *insn) 
	int i;



	for (i = 0; i < insn->prefixes.nbytes; i++) {

		switch (insn->prefixes.bytes[i]) {

		case 0x26:	/* INAT_PFX_ES   */

		case 0x2E:	/* INAT_PFX_CS   */

		case 0x36:	/* INAT_PFX_DS   */

		case 0x3E:	/* INAT_PFX_SS   */

		case 0xF0:	/* INAT_PFX_LOCK */

		insn_attr_t attr;



		attr = inat_get_opcode_attribute(insn->prefixes.bytes[i]);

		switch (attr) {

		case INAT_MAKE_PREFIX(INAT_PFX_ES):

		case INAT_MAKE_PREFIX(INAT_PFX_CS):

		case INAT_MAKE_PREFIX(INAT_PFX_DS):

		case INAT_MAKE_PREFIX(INAT_PFX_SS):

		case INAT_MAKE_PREFIX(INAT_PFX_LOCK):

			return true;

		}

	}

arch/x86/lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ lib-y := delay.o misc.o cmdline.o cpu.o 
lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o

lib-y += memcpy_$(BITS).o

lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o

lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o

lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o insn-eval.o

lib-$(CONFIG_RANDOMIZE_BASE) += kaslr.o



obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o