Merge branch 'for-5.18/selftests-fixes' into for-next

pmladek · pmladek · commit 0e1b951d6de0 · 2022-03-23T16:42:43.000+01:00
diff --git a/samples/livepatch/livepatch-shadow-fix1.c b/samples/livepatch/livepatch-shadow-fix1.c
@@ -109,9 +109,9 @@ static void livepatch_fix1_dummy_leak_dtor(void *obj, void *shadow_data)
 	void *d = obj;
 	int **shadow_leak = shadow_data;
 
-	kfree(*shadow_leak);
 	pr_info("%s: dummy @ %p, prevented leak @ %p\n",
 			 __func__, d, *shadow_leak);
+	kfree(*shadow_leak);
 }
 
 static void livepatch_fix1_dummy_free(struct dummy *d)
diff --git a/samples/livepatch/livepatch-shadow-fix2.c b/samples/livepatch/livepatch-shadow-fix2.c
@@ -61,9 +61,9 @@ static void livepatch_fix2_dummy_leak_dtor(void *obj, void *shadow_data)
 	void *d = obj;
 	int **shadow_leak = shadow_data;
 
-	kfree(*shadow_leak);
 	pr_info("%s: dummy @ %p, prevented leak @ %p\n",
 			 __func__, d, *shadow_leak);
+	kfree(*shadow_leak);
 }
 
 static void livepatch_fix2_dummy_free(struct dummy *d)

Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,9 @@ static void livepatch_fix1_dummy_leak_dtor(void obj, void shadow_data)`
`109`	`109`	`void *d = obj;`
`110`	`110`	`int **shadow_leak = shadow_data;`
`111`	`111`
`112`		`- kfree(*shadow_leak);`
`113`	`112`	`pr_info("%s: dummy @ %p, prevented leak @ %p\n",`
`114`	`113`	`__func__, d, *shadow_leak);`
	`114`	`+ kfree(*shadow_leak);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`static void livepatch_fix1_dummy_free(struct dummy *d)`
Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,9 @@ static void livepatch_fix2_dummy_leak_dtor(void obj, void shadow_data)`
`61`	`61`	`void *d = obj;`
`62`	`62`	`int **shadow_leak = shadow_data;`
`63`	`63`
`64`		`- kfree(*shadow_leak);`
`65`	`64`	`pr_info("%s: dummy @ %p, prevented leak @ %p\n",`
`66`	`65`	`__func__, d, *shadow_leak);`
	`66`	`+ kfree(*shadow_leak);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`static void livepatch_fix2_dummy_free(struct dummy *d)`