diff options
Diffstat (limited to 'fs/verity/init.c')
| -rw-r--r-- | fs/verity/init.c | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/fs/verity/init.c b/fs/verity/init.c index c98b7016f446..6e8d33b50240 100644 --- a/fs/verity/init.c +++ b/fs/verity/init.c @@ -9,6 +9,31 @@ #include <linux/ratelimit.h> +#ifdef CONFIG_SYSCTL +static const struct ctl_table fsverity_sysctl_table[] = { +#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES + { + .procname = "require_signatures", + .data = &fsverity_require_signatures, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, +#endif +}; + +static void __init fsverity_init_sysctl(void) +{ + register_sysctl_init("fs/verity", fsverity_sysctl_table); +} +#else /* CONFIG_SYSCTL */ +static inline void fsverity_init_sysctl(void) +{ +} +#endif /* !CONFIG_SYSCTL */ + void fsverity_msg(const struct inode *inode, const char *level, const char *fmt, ...) { @@ -33,29 +58,12 @@ void fsverity_msg(const struct inode *inode, const char *level, static int __init fsverity_init(void) { - int err; - fsverity_check_hash_algs(); - - err = fsverity_init_info_cache(); - if (err) - return err; - - err = fsverity_init_workqueue(); - if (err) - goto err_exit_info_cache; - - err = fsverity_init_signature(); - if (err) - goto err_exit_workqueue; - - pr_debug("Initialized fs-verity\n"); + fsverity_init_info_cache(); + fsverity_init_workqueue(); + fsverity_init_sysctl(); + fsverity_init_signature(); + fsverity_init_bpf(); return 0; - -err_exit_workqueue: - fsverity_exit_workqueue(); -err_exit_info_cache: - fsverity_exit_info_cache(); - return err; } late_initcall(fsverity_init) |