Commit b47c1823 authored by Linus Torvalds's avatar Linus Torvalds

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
parents fc883e7a ee5814dd
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
static struct ctl_table_header *fsverity_sysctl_header;
static struct ctl_table fsverity_sysctl_table[] = { static struct ctl_table fsverity_sysctl_table[] = {
#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES #ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES
{ {
...@@ -28,10 +26,7 @@ static struct ctl_table fsverity_sysctl_table[] = { ...@@ -28,10 +26,7 @@ static struct ctl_table fsverity_sysctl_table[] = {
static void __init fsverity_init_sysctl(void) static void __init fsverity_init_sysctl(void)
{ {
fsverity_sysctl_header = register_sysctl("fs/verity", register_sysctl_init("fs/verity", fsverity_sysctl_table);
fsverity_sysctl_table);
if (!fsverity_sysctl_header)
panic("fsverity sysctl registration failed");
} }
#else /* CONFIG_SYSCTL */ #else /* CONFIG_SYSCTL */
static inline void fsverity_init_sysctl(void) static inline void fsverity_init_sysctl(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment