diff for duplicates of <161676171800.330141.6196229389836286674.stgit@devnote2> diff --git a/a/1.txt b/N1/1.txt index c465e9b..6fb8d90 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,15 +40,14 @@ index fc1ff8a4d7de..ca4b4fa45aef 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_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 1cb8c5b..0377b3d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0161676170650.330141.6214727134265514123.stgit@devnote2\0" "From\0Masami Hiramatsu <mhiramat@kernel.org>\0" "Subject\0[PATCH -tip v5 01/12] ia64: kprobes: Fix to pass correct trampoline address to the handler\0" - "Date\0Fri, 26 Mar 2021 21:28:38 +0900\0" + "Date\0Fri, 26 Mar 2021 12:28:38 +0000\0" "To\0Steven Rostedt <rostedt@goodmis.org>" " Ingo Molnar <mingo@kernel.org>\0" "Cc\0X86 ML <x86@kernel.org>" @@ -62,19 +62,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_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;" -5e6e1d64ef693d5097e9bab1a3b9ae08ccd067a71cd5e3bd036859cdd4ec1915 +cf7f07a941c21cf1c6672f22e7746cee548a47cb55298c483d8dbbf0e2be7674
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.