All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <162756759271.301564.10363130663046904166.stgit@devnote2>

diff --git a/a/1.txt b/N1/1.txt
index c2f0db2..2a49260 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 0764e8a0de69..03c85962296a 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 2b0d04a1b7d2..7d8867106734 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 a0bf446bb034..9b2e69619057 100644
 +	static const char tramp_name[] = "__kretprobe_trampoline";
  	int size = sizeof(tramp_name);
  
- 	if (strncmp(tramp_name, name, size) == 0)
\ No newline at end of file
+ 	if (strncmp(tramp_name, name, size) = 0)
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 62d18c8..cda5a29 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
   "Subject\0[PATCH -tip v10 04/16] kprobes: treewide: Make it harder to refer kretprobe_trampoline directly\0"
 ]
 [
-  "Date\0Thu, 29 Jul 2021 23:06:32 +0900\0"
+  "Date\0Thu, 29 Jul 2021 14:06:32 +0000\0"
 ]
 [
   "To\0Steven Rostedt <rostedt\@goodmis.org>",
@@ -131,8 +131,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",
@@ -282,15 +282,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",
@@ -331,8 +330,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",
@@ -430,8 +429,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",
@@ -443,8 +442,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",
@@ -456,8 +455,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",
@@ -556,8 +555,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",
@@ -568,8 +567,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",
@@ -645,8 +644,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",
@@ -672,8 +670,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",
@@ -764,7 +762,7 @@
   "+\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)"
 ]
 
-b7b8f6c639282f6d3bada039a39ac4016518c55b57b8d527a1e4bb4bbf755b86
+1b15fdd7c0f690760e1ae3ea022e6a1e53fb70985d69a5a12473690de3d085d9
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.