]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
dtrace: initialize the insn length in the right branch of the die notifier
authorNick Alcock <nick.alcock@oracle.com>
Tue, 17 Jan 2012 13:46:02 +0000 (13:46 +0000)
committerNick Alcock <nick.alcock@oracle.com>
Mon, 29 Jun 2015 21:40:23 +0000 (22:40 +0100)
Absent this fix, dtrace will crash on any platform *except* for a buggy Xen.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
kernel/dtrace/dtrace_os.c

index b20e9bc8c3aaa48c11ee712c0109f422366349cf..cc0d8e20a993d886b4e79de1a33aa6fbb97e0de7 100644 (file)
@@ -307,6 +307,9 @@ static int dtrace_die_notifier(struct notifier_block *nb, unsigned long val,
                }
 
                if (rval != 0) {
+                       kernel_insn_init(&insn, (void *)dargs->regs->ip);
+                       insn_get_length(&insn);
+
                        dargs->regs->ip += insn.length;
 
                        return NOTIFY_OK | NOTIFY_STOP_MASK;