diff for duplicates of <163163045446.489837.14510577516938803097.stgit@devnote2> diff --git a/a/1.txt b/N1/1.txt index 55ad6d3..be8a46f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -89,8 +89,8 @@ index 3cee75c87f97..e71d64119d71 100644 int __kprobes arch_trampoline_kprobe(struct kprobe *p) { -- if (p->addr == (kprobe_opcode_t *) &kretprobe_trampoline) -+ if (p->addr == (kprobe_opcode_t *) &__kretprobe_trampoline) +- if (p->addr = (kprobe_opcode_t *) &kretprobe_trampoline) ++ if (p->addr = (kprobe_opcode_t *) &__kretprobe_trampoline) return 1; return 0; @@ -240,15 +240,14 @@ index 44c84c20b626..1a7bab1c5d7c 100644 @@ -897,14 +897,14 @@ static struct kprobe trampoline_p = { int __init arch_init_kprobes(void) { - trampoline_p.addr = -- dereference_function_descriptor(kretprobe_trampoline); + trampoline_p.addr - dereference_function_descriptor(kretprobe_trampoline); + dereference_function_descriptor(__kretprobe_trampoline); return register_kprobe(&trampoline_p); } int __kprobes arch_trampoline_kprobe(struct kprobe *p) { - if (p->addr == + if (p->addr = - dereference_function_descriptor(kretprobe_trampoline)) + dereference_function_descriptor(__kretprobe_trampoline)) return 1; @@ -289,8 +288,8 @@ index b33bd2498651..6c7f3b143fdc 100644 int __kprobes arch_trampoline_kprobe(struct kprobe *p) { -- if (p->addr == (kprobe_opcode_t *)kretprobe_trampoline) -+ if (p->addr == (kprobe_opcode_t *)__kretprobe_trampoline) +- if (p->addr = (kprobe_opcode_t *)kretprobe_trampoline) ++ if (p->addr = (kprobe_opcode_t *)__kretprobe_trampoline) return 1; return 0; @@ -388,8 +387,8 @@ index 43c77142a262..86d77ff056a6 100644 int arch_trampoline_kprobe(struct kprobe *p) { -- if (p->addr == (kprobe_opcode_t *)&kretprobe_trampoline) -+ if (p->addr == (kprobe_opcode_t *)&__kretprobe_trampoline) +- if (p->addr = (kprobe_opcode_t *)&kretprobe_trampoline) ++ if (p->addr = (kprobe_opcode_t *)&__kretprobe_trampoline) return 1; return 0; @@ -401,8 +400,8 @@ index 325ba544883c..ce1903064031 100644 * has a 'nop' instruction, which can be emulated. * So further checks can be skipped. */ -- if (p->addr == (kprobe_opcode_t *)&kretprobe_trampoline) -+ if (p->addr == (kprobe_opcode_t *)&__kretprobe_trampoline) +- if (p->addr = (kprobe_opcode_t *)&kretprobe_trampoline) ++ if (p->addr = (kprobe_opcode_t *)&__kretprobe_trampoline) return addr + sizeof(kprobe_opcode_t); /* @@ -414,8 +413,8 @@ index 9e4a4a7af380..a2443d61728e 100644 * Mark stacktraces with kretprobed functions on them * as unreliable. */ -- if (ip == (unsigned long)kretprobe_trampoline) -+ if (ip == (unsigned long)__kretprobe_trampoline) +- if (ip = (unsigned long)kretprobe_trampoline) ++ if (ip = (unsigned long)__kretprobe_trampoline) return -EINVAL; #endif @@ -514,8 +513,8 @@ index 5fa86e54f129..c505c0ee5f47 100644 int arch_trampoline_kprobe(struct kprobe *p) { -- return p->addr == (kprobe_opcode_t *) &kretprobe_trampoline; -+ return p->addr == (kprobe_opcode_t *) &__kretprobe_trampoline; +- return p->addr = (kprobe_opcode_t *) &kretprobe_trampoline; ++ return p->addr = (kprobe_opcode_t *) &__kretprobe_trampoline; } NOKPROBE_SYMBOL(arch_trampoline_kprobe); diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c @@ -526,8 +525,8 @@ index 101477b3e263..b7bb1981e9ee 100644 * Mark stacktraces with kretprobed functions on them * as unreliable. */ -- if (state.ip == (unsigned long)kretprobe_trampoline) -+ if (state.ip == (unsigned long)__kretprobe_trampoline) +- if (state.ip = (unsigned long)kretprobe_trampoline) ++ if (state.ip = (unsigned long)__kretprobe_trampoline) return -EINVAL; #endif @@ -603,8 +602,7 @@ index 401534236c2e..535c7b35cb59 100644 @@ -440,7 +440,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, /* Replace the return addr with trampoline addr */ - regs->u_regs[UREG_RETPC] = -- ((unsigned long)kretprobe_trampoline) - 8; + regs->u_regs[UREG_RETPC] - ((unsigned long)kretprobe_trampoline) - 8; + ((unsigned long)__kretprobe_trampoline) - 8; } @@ -630,8 +628,8 @@ index 401534236c2e..535c7b35cb59 100644 int __kprobes arch_trampoline_kprobe(struct kprobe *p) { -- if (p->addr == (kprobe_opcode_t *)&kretprobe_trampoline) -+ if (p->addr == (kprobe_opcode_t *)&__kretprobe_trampoline) +- if (p->addr = (kprobe_opcode_t *)&kretprobe_trampoline) ++ if (p->addr = (kprobe_opcode_t *)&__kretprobe_trampoline) return 1; return 0; @@ -722,4 +720,4 @@ index c2ca40e8595b..5a5949c659d0 100644 + static const char tramp_name[] = "__kretprobe_trampoline"; int size = sizeof(tramp_name); - if (strncmp(tramp_name, name, size) == 0) + if (strncmp(tramp_name, name, size) = 0) diff --git a/a/content_digest b/N1/content_digest index fc4ae01..bb639dd 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 15/27] kprobes: treewide: Make it harder to refer kretprobe_trampoline directly\0" - "Date\0Tue, 14 Sep 2021 23:40:54 +0900\0" + "Date\0Tue, 14 Sep 2021 14:40:54 +0000\0" "To\0Steven Rostedt <rostedt@goodmis.org>" Josh Poimboeuf <jpoimboe@redhat.com> " Ingo Molnar <mingo@kernel.org>\0" @@ -115,8 +115,8 @@ " \n" " int __kprobes arch_trampoline_kprobe(struct kprobe *p)\n" " {\n" - "-\tif (p->addr == (kprobe_opcode_t *) &kretprobe_trampoline)\n" - "+\tif (p->addr == (kprobe_opcode_t *) &__kretprobe_trampoline)\n" + "-\tif (p->addr = (kprobe_opcode_t *) &kretprobe_trampoline)\n" + "+\tif (p->addr = (kprobe_opcode_t *) &__kretprobe_trampoline)\n" " \t\treturn 1;\n" " \n" " \treturn 0;\n" @@ -266,15 +266,14 @@ "@@ -897,14 +897,14 @@ static struct kprobe trampoline_p = {\n" " int __init arch_init_kprobes(void)\n" " {\n" - " \ttrampoline_p.addr =\n" - "-\t\tdereference_function_descriptor(kretprobe_trampoline);\n" + " \ttrampoline_p.addr -\t\tdereference_function_descriptor(kretprobe_trampoline);\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\tdereference_function_descriptor(kretprobe_trampoline))\n" "+\t\tdereference_function_descriptor(__kretprobe_trampoline))\n" " \t\treturn 1;\n" @@ -315,8 +314,8 @@ " \n" " int __kprobes arch_trampoline_kprobe(struct kprobe *p)\n" " {\n" - "-\tif (p->addr == (kprobe_opcode_t *)kretprobe_trampoline)\n" - "+\tif (p->addr == (kprobe_opcode_t *)__kretprobe_trampoline)\n" + "-\tif (p->addr = (kprobe_opcode_t *)kretprobe_trampoline)\n" + "+\tif (p->addr = (kprobe_opcode_t *)__kretprobe_trampoline)\n" " \t\treturn 1;\n" " \n" " \treturn 0;\n" @@ -414,8 +413,8 @@ " \n" " int arch_trampoline_kprobe(struct kprobe *p)\n" " {\n" - "-\tif (p->addr == (kprobe_opcode_t *)&kretprobe_trampoline)\n" - "+\tif (p->addr == (kprobe_opcode_t *)&__kretprobe_trampoline)\n" + "-\tif (p->addr = (kprobe_opcode_t *)&kretprobe_trampoline)\n" + "+\tif (p->addr = (kprobe_opcode_t *)&__kretprobe_trampoline)\n" " \t\treturn 1;\n" " \n" " \treturn 0;\n" @@ -427,8 +426,8 @@ " \t * has a 'nop' instruction, which can be emulated.\n" " \t * So further checks can be skipped.\n" " \t */\n" - "-\tif (p->addr == (kprobe_opcode_t *)&kretprobe_trampoline)\n" - "+\tif (p->addr == (kprobe_opcode_t *)&__kretprobe_trampoline)\n" + "-\tif (p->addr = (kprobe_opcode_t *)&kretprobe_trampoline)\n" + "+\tif (p->addr = (kprobe_opcode_t *)&__kretprobe_trampoline)\n" " \t\treturn addr + sizeof(kprobe_opcode_t);\n" " \n" " \t/*\n" @@ -440,8 +439,8 @@ " \t\t * Mark stacktraces with kretprobed functions on them\n" " \t\t * as unreliable.\n" " \t\t */\n" - "-\t\tif (ip == (unsigned long)kretprobe_trampoline)\n" - "+\t\tif (ip == (unsigned long)__kretprobe_trampoline)\n" + "-\t\tif (ip = (unsigned long)kretprobe_trampoline)\n" + "+\t\tif (ip = (unsigned long)__kretprobe_trampoline)\n" " \t\t\treturn -EINVAL;\n" " #endif\n" " \n" @@ -540,8 +539,8 @@ " \n" " int arch_trampoline_kprobe(struct kprobe *p)\n" " {\n" - "-\treturn p->addr == (kprobe_opcode_t *) &kretprobe_trampoline;\n" - "+\treturn p->addr == (kprobe_opcode_t *) &__kretprobe_trampoline;\n" + "-\treturn p->addr = (kprobe_opcode_t *) &kretprobe_trampoline;\n" + "+\treturn p->addr = (kprobe_opcode_t *) &__kretprobe_trampoline;\n" " }\n" " NOKPROBE_SYMBOL(arch_trampoline_kprobe);\n" "diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c\n" @@ -552,8 +551,8 @@ " \t\t * Mark stacktraces with kretprobed functions on them\n" " \t\t * as unreliable.\n" " \t\t */\n" - "-\t\tif (state.ip == (unsigned long)kretprobe_trampoline)\n" - "+\t\tif (state.ip == (unsigned long)__kretprobe_trampoline)\n" + "-\t\tif (state.ip = (unsigned long)kretprobe_trampoline)\n" + "+\t\tif (state.ip = (unsigned long)__kretprobe_trampoline)\n" " \t\t\treturn -EINVAL;\n" " #endif\n" " \n" @@ -629,8 +628,7 @@ "@@ -440,7 +440,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,\n" " \n" " \t/* Replace the return addr with trampoline addr */\n" - " \tregs->u_regs[UREG_RETPC] =\n" - "-\t\t((unsigned long)kretprobe_trampoline) - 8;\n" + " \tregs->u_regs[UREG_RETPC] -\t\t((unsigned long)kretprobe_trampoline) - 8;\n" "+\t\t((unsigned long)__kretprobe_trampoline) - 8;\n" " }\n" " \n" @@ -656,8 +654,8 @@ " \n" " int __kprobes arch_trampoline_kprobe(struct kprobe *p)\n" " {\n" - "-\tif (p->addr == (kprobe_opcode_t *)&kretprobe_trampoline)\n" - "+\tif (p->addr == (kprobe_opcode_t *)&__kretprobe_trampoline)\n" + "-\tif (p->addr = (kprobe_opcode_t *)&kretprobe_trampoline)\n" + "+\tif (p->addr = (kprobe_opcode_t *)&__kretprobe_trampoline)\n" " \t\treturn 1;\n" " \n" " \treturn 0;\n" @@ -748,6 +746,6 @@ "+\tstatic const char tramp_name[] = \"__kretprobe_trampoline\";\n" " \tint size = sizeof(tramp_name);\n" " \n" - " \tif (strncmp(tramp_name, name, size) == 0)" + " \tif (strncmp(tramp_name, name, size) = 0)" -db24bd00fbbaa4558994b5b77fb0fa3c033456a9230e2f19cefba62d463063af +b3a0592cb8ce28e2af686a19639e2d9a9cc6e117ea4ae9b5910f1c4a7a0ae06b
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.