Merge tag 'upstream-3.19-rc1' of git://git.infradead.org/linux-ubifs

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

diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
index 5d1cbfe..8b96a94 100644 (file)
--- a/arch/x86/kernel/uprobes.c
+++ b/arch/x86/kernel/uprobes.c
@@ -219,7 +219,7 @@ static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool
 {
        u32 volatile *good_insns;
 
-       insn_init(insn, auprobe->insn, x86_64);
+       insn_init(insn, auprobe->insn, sizeof(auprobe->insn), x86_64);
        /* has the side-effect of processing the entire instruction */
        insn_get_length(insn);
        if (WARN_ON_ONCE(!insn_complete(insn)))