Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linux

torvalds · torvalds · commit b47c18232a85 · 2024-05-14T17:49:24.000-07:00
Pull fsverity update from Eric Biggers:
 "Fix a false positive kmemleak warning"

* tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linux:
  fsverity: use register_sysctl_init() to avoid kmemleak warning
diff --git a/fs/verity/init.c b/fs/verity/init.c
@@ -10,8 +10,6 @@
 #include <linux/ratelimit.h>
 
 #ifdef CONFIG_SYSCTL
-static struct ctl_table_header *fsverity_sysctl_header;
-
 static struct ctl_table fsverity_sysctl_table[] = {
 #ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES
 	{
@@ -28,10 +26,7 @@ static struct ctl_table fsverity_sysctl_table[] = {
 
 static void __init fsverity_init_sysctl(void)
 {
-	fsverity_sysctl_header = register_sysctl("fs/verity",
-						 fsverity_sysctl_table);
-	if (!fsverity_sysctl_header)
-		panic("fsverity sysctl registration failed");
+	register_sysctl_init("fs/verity", fsverity_sysctl_table);
 }
 #else /* CONFIG_SYSCTL */
 static inline void fsverity_init_sysctl(void)

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`#include <linux/ratelimit.h>`
`11`	`11`
`12`	`12`	`#ifdef CONFIG_SYSCTL`
`13`		`-static struct ctl_table_header *fsverity_sysctl_header;`
`14`		`-`
`15`	`13`	`static struct ctl_table fsverity_sysctl_table[] = {`
`16`	`14`	`#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES`
`17`	`15`	`{`
`@@ -28,10 +26,7 @@ static struct ctl_table fsverity_sysctl_table[] = {`
`28`	`26`
`29`	`27`	`static void __init fsverity_init_sysctl(void)`
`30`	`28`	`{`
`31`		`- fsverity_sysctl_header = register_sysctl("fs/verity",`
`32`		`- fsverity_sysctl_table);`
`33`		`- if (!fsverity_sysctl_header)`
`34`		`- panic("fsverity sysctl registration failed");`
	`29`	`+ register_sysctl_init("fs/verity", fsverity_sysctl_table);`
`35`	`30`	`}`
`36`	`31`	`#else /* CONFIG_SYSCTL */`
`37`	`32`	`static inline void fsverity_init_sysctl(void)`