Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[muen/linux.git] / arch / x86 / kernel / uprobes.c

diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
index d1c468741915e478e62ba8c0d72e970da1f8eb83..58d8d800875d0c6a3789a0406fec1eed366eecfc 100644 (file)
--- a/arch/x86/kernel/uprobes.c
+++ b/arch/x86/kernel/uprobes.c
@@ -299,6 +299,10 @@ static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool
        if (is_prefix_bad(insn))
                return -ENOTSUPP;
 
+       /* We should not singlestep on the exception masking instructions */
+       if (insn_masking_exception(insn))
+               return -ENOTSUPP;
+
        if (x86_64)
                good_insns = good_insns_64;
        else