diff for duplicates of <163163042696.489837.12551102356265354730.stgit@devnote2> diff --git a/a/1.txt b/N1/1.txt index 6e8d096..35e1cec 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,15 +49,14 @@ index 441ed04b1037..d4048518a1d7 100644 @@ -902,14 +903,14 @@ static struct kprobe trampoline_p = { int __init arch_init_kprobes(void) { - trampoline_p.addr = -- (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip; + trampoline_p.addr - (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip; + dereference_function_descriptor(kretprobe_trampoline); return register_kprobe(&trampoline_p); } int __kprobes arch_trampoline_kprobe(struct kprobe *p) { - if (p->addr == + if (p->addr = - (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip) + dereference_function_descriptor(kretprobe_trampoline)) return 1; diff --git a/a/content_digest b/N1/content_digest index 3e2855a..ae21f40 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0163163030719.489837.2236069935502195491.stgit@devnote2\0" "From\0Masami Hiramatsu <mhiramat@kernel.org>\0" "Subject\0[PATCH -tip v11 12/27] ia64: kprobes: Fix to pass correct trampoline address to the handler\0" - "Date\0Tue, 14 Sep 2021 23:40:27 +0900\0" + "Date\0Tue, 14 Sep 2021 14:40:27 +0000\0" "To\0Steven Rostedt <rostedt@goodmis.org>" Josh Poimboeuf <jpoimboe@redhat.com> " Ingo Molnar <mingo@kernel.org>\0" @@ -75,19 +75,18 @@ "@@ -902,14 +903,14 @@ static struct kprobe trampoline_p = {\n" " int __init arch_init_kprobes(void)\n" " {\n" - " \ttrampoline_p.addr =\n" - "-\t\t(kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip;\n" + " \ttrampoline_p.addr -\t\t(kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip;\n" "+\t\tdereference_function_descriptor(kretprobe_trampoline);\n" " \treturn register_kprobe(&trampoline_p);\n" " }\n" " \n" " int __kprobes arch_trampoline_kprobe(struct kprobe *p)\n" " {\n" - " \tif (p->addr ==\n" + " \tif (p->addr =\n" "-\t\t(kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip)\n" "+\t\tdereference_function_descriptor(kretprobe_trampoline))\n" " \t\treturn 1;\n" " \n" " \treturn 0;" -63c010eb2f130144259aa18393935893de01c9e11657ae6ea61be61f4779b4c2 +56e12df1303ce6036e75efa85762180d868fb9ad40e6eae50e3f2af0d7d00a90
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.