diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-15 03:49:24 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-15 03:49:24 +0300 |
commit | b47c18232a85ae064ad923de402f0a21d46155e2 (patch) | |
tree | 2a0decbc836fa9f640226fe532ab92d5e126fcb0 /fs | |
parent | fc883e7a500fcded49e5d295737c7af6ba9fe7b9 (diff) | |
parent | ee5814dddefbaa181cb247a75676dd5103775db1 (diff) | |
download | linux-b47c18232a85ae064ad923de402f0a21d46155e2.tar.xz |
Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linux
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
Diffstat (limited to 'fs')
-rw-r--r-- | fs/verity/init.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/verity/init.c b/fs/verity/init.c index cb2c9aac61ed..f440f0e61e3e 100644 --- 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) |