Merge branch 'for-next/scs' into for-next/core

willdeacon · willdeacon · commit 3d9c8315fa9b · 2021-10-29T12:25:24.000+01:00
* for-next/scs:
  scs: Release kasan vmalloc poison in scs_free process
diff --git a/kernel/scs.c b/kernel/scs.c
@@ -78,6 +78,7 @@ void scs_free(void *s)
 		if (this_cpu_cmpxchg(scs_cache[i], 0, s) == NULL)
 			return;
 
+	kasan_unpoison_vmalloc(s, SCS_SIZE);
 	vfree_atomic(s);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ void scs_free(void *s)`
`78`	`78`	`if (this_cpu_cmpxchg(scs_cache[i], 0, s) == NULL)`
`79`	`79`	`return;`
`80`	`80`
	`81`	`+ kasan_unpoison_vmalloc(s, SCS_SIZE);`
`81`	`82`	`vfree_atomic(s);`
`82`	`83`	`}`
`83`	`84`