|
@@ -43,6 +43,7 @@
|
|
|
#include <linux/uaccess.h>
|
|
|
#include <linux/elf-randomize.h>
|
|
|
#include <linux/pkeys.h>
|
|
|
+#include <linux/seq_buf.h>
|
|
|
|
|
|
#include <asm/pgtable.h>
|
|
|
#include <asm/io.h>
|
|
@@ -1300,7 +1301,9 @@ static void show_instructions(struct pt_regs *regs)
|
|
|
void show_user_instructions(struct pt_regs *regs)
|
|
|
{
|
|
|
unsigned long pc;
|
|
|
- int i;
|
|
|
+ int n = instructions_to_print;
|
|
|
+ struct seq_buf s;
|
|
|
+ char buf[96]; /* enough for 8 times 9 + 2 chars */
|
|
|
|
|
|
pc = regs->nip - (instructions_to_print * 3 / 4 * sizeof(int));
|
|
|
|
|
@@ -1314,29 +1317,27 @@ void show_user_instructions(struct pt_regs *regs)
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- pr_info("%s[%d]: code: ", current->comm, current->pid);
|
|
|
+ seq_buf_init(&s, buf, sizeof(buf));
|
|
|
|
|
|
- for (i = 0; i < instructions_to_print; i++) {
|
|
|
- int instr;
|
|
|
+ while (n) {
|
|
|
+ int i;
|
|
|
|
|
|
- if (!(i % 8) && (i > 0)) {
|
|
|
- pr_cont("\n");
|
|
|
- pr_info("%s[%d]: code: ", current->comm, current->pid);
|
|
|
- }
|
|
|
+ seq_buf_clear(&s);
|
|
|
|
|
|
- if (probe_kernel_address((const void *)pc, instr)) {
|
|
|
- pr_cont("XXXXXXXX ");
|
|
|
- } else {
|
|
|
- if (regs->nip == pc)
|
|
|
- pr_cont("<%08x> ", instr);
|
|
|
- else
|
|
|
- pr_cont("%08x ", instr);
|
|
|
+ for (i = 0; i < 8 && n; i++, n--, pc += sizeof(int)) {
|
|
|
+ int instr;
|
|
|
+
|
|
|
+ if (probe_kernel_address((const void *)pc, instr)) {
|
|
|
+ seq_buf_printf(&s, "XXXXXXXX ");
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ seq_buf_printf(&s, regs->nip == pc ? "<%08x> " : "%08x ", instr);
|
|
|
}
|
|
|
|
|
|
- pc += sizeof(int);
|
|
|
+ if (!seq_buf_has_overflowed(&s))
|
|
|
+ pr_info("%s[%d]: code: %s\n", current->comm,
|
|
|
+ current->pid, s.buffer);
|
|
|
}
|
|
|
-
|
|
|
- pr_cont("\n");
|
|
|
}
|
|
|
|
|
|
struct regbit {
|