Commit b47c1823 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

fs/verity/init.c

+1 −6
Original line number Diff line number Diff line
@@ -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)