diff for duplicates of <161615651484.306069.13374738532116114679.stgit@devnote2> diff --git a/a/1.txt b/N1/1.txt index be60eba..45f6564 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,15 +37,14 @@ index fc1ff8a4d7de..006fbc1d7ae9 100644 @@ -918,14 +919,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_description(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 3eba135..d4aa16a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0161615650355.306069.17260992641363840330.stgit@devnote2\0" "From\0Masami Hiramatsu <mhiramat@kernel.org>\0" "Subject\0[PATCH -tip v3 01/11] ia64: kprobes: Fix to pass correct trampoline address to the handler\0" - "Date\0Fri, 19 Mar 2021 21:21:55 +0900\0" + "Date\0Fri, 19 Mar 2021 12:21:55 +0000\0" "To\0Steven Rostedt <rostedt@goodmis.org>" " Ingo Molnar <mingo@kernel.org>\0" "Cc\0X86 ML <x86@kernel.org>" @@ -58,19 +58,18 @@ "@@ -918,14 +919,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_description(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;" -b410510cf8c60635ae5e6b8015a98bfcc8950cde8004bfd81277cd682de4ec1b +b244ab023dcff283dc3e2d5351e624342d5c8594a68fb3df6c29f4432f8c3e51
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.