Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/ker…

…nel/git/oleg/misc into perf/core Pull uprobes fixes and cleanups from Oleg Nesterov: "Any probed jmp/call can kill the application, see the changelog in 11/15." Signed-off-by: Ingo Molnar <mingo@kernel.org>
mariux64 · Apr 18, 2014 · 37b6cb4 · 37b6cb4
2 parents b3d5fc3 + 6cc5e7f
commit 37b6cb4
Show file tree

Hide file tree

Showing 3 changed files with 372 additions and 226 deletions.
diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h
@@ -33,15 +33,27 @@ typedef u8 uprobe_opcode_t;
 #define UPROBE_SWBP_INSN		0xcc
 #define UPROBE_SWBP_INSN_SIZE		   1
 
+struct uprobe_xol_ops;
+
 struct arch_uprobe {
-	u16				fixups;
 	union {
 		u8			insn[MAX_UINSN_BYTES];
 		u8			ixol[MAX_UINSN_BYTES];
 	};
+
+	u16				fixups;
+	const struct uprobe_xol_ops	*ops;
+
+	union {
 #ifdef CONFIG_X86_64
-	unsigned long			rip_rela_target_address;
+		unsigned long			rip_rela_target_address;
 #endif
+		struct {
+			s32	offs;
+			u8	ilen;
+			u8	opc1;
+		}				branch;
+	};
 };
 
 struct arch_uprobe_task {