iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fsverity: move sysctl registration out of signature.c

Browse Source 
Currently the registration of the fsverity sysctls happens in
signature.c, which couples it to CONFIG_FS_VERITY_BUILTIN_SIGNATURES.

This makes it hard to add new sysctls unrelated to builtin signatures.

Also, some users have started checking whether the directory
/proc/sys/fs/verity exists as a way to tell whether fsverity is
supported.  This isn't the intended method; instead, the existence of
/sys/fs/$fstype/features/verity should be checked, or users should just
try to use the fsverity ioctls.  Regardless, it should be made to work
as expected without a dependency on CONFIG_FS_VERITY_BUILTIN_SIGNATURES.

Therefore, move the sysctl registration into init.c.  With
CONFIG_FS_VERITY_BUILTIN_SIGNATURES, nothing changes.  Without it, but
with CONFIG_FS_VERITY, an empty list of sysctls is now registered.

Link: https://lore.kernel.org/r/20230705212743.42180-3-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2023-07-05 14:27:43 -07:00
parent e77000ccc5
commit 456ae5fe9b
3 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/verity/fsverity_private.h
View File

@ -123,6 +123,7 @@ void __init fsverity_init_info_cache(void);
/* signature.c */ /* signature.c */
#ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES #ifdef CONFIG_FS_VERITY_BUILTIN_SIGNATURES
extern int fsverity_require_signatures;
int fsverity_verify_signature(const struct fsverity_info *vi, int fsverity_verify_signature(const struct fsverity_info *vi,
const u8 *signature, size_t sig_size); const u8 *signature, size_t sig_size);

32
fs/verity/init.c
View File

@ -9,6 +9,37 @@
#include <linux/ratelimit.h> #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
{
.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)
{
fsverity_sysctl_header = register_sysctl("fs/verity",
fsverity_sysctl_table);
if (!fsverity_sysctl_header)
panic("fsverity sysctl registration failed");
}
#else /* CONFIG_SYSCTL */
static inline void fsverity_init_sysctl(void)
{
}
#endif /* !CONFIG_SYSCTL */
void fsverity_msg(const struct inode *inode, const char *level, void fsverity_msg(const struct inode *inode, const char *level,
const char *fmt, ...) const char *fmt, ...)
{ {
@ -36,6 +67,7 @@ static int __init fsverity_init(void)
fsverity_check_hash_algs(); fsverity_check_hash_algs();
fsverity_init_info_cache(); fsverity_init_info_cache();
fsverity_init_workqueue(); fsverity_init_workqueue();
fsverity_init_sysctl();
fsverity_init_signature(); fsverity_init_signature();
return 0; return 0;
} }

33
fs/verity/signature.c
View File

@ -24,7 +24,7 @@
* /proc/sys/fs/verity/require_signatures * /proc/sys/fs/verity/require_signatures
* If 1, all verity files must have a valid builtin signature. * If 1, all verity files must have a valid builtin signature.
*/ */
static int fsverity_require_signatures; int fsverity_require_signatures;
/* /*
* Keyring that contains the trusted X.509 certificates. * Keyring that contains the trusted X.509 certificates.
@ -93,35 +93,6 @@ int fsverity_verify_signature(const struct fsverity_info *vi,
return 0; return 0;
} }
#ifdef CONFIG_SYSCTL
static struct ctl_table_header *fsverity_sysctl_header;
static struct ctl_table fsverity_sysctl_table[] = {
{
.procname = "require_signatures",
.data = &fsverity_require_signatures,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE,
},
{ }
};
static void __init fsverity_sysctl_init(void)
{
fsverity_sysctl_header = register_sysctl("fs/verity",
fsverity_sysctl_table);
if (!fsverity_sysctl_header)
panic("fsverity sysctl registration failed");
}
#else /* !CONFIG_SYSCTL */
static inline void fsverity_sysctl_init(void)
{
}
#endif /* !CONFIG_SYSCTL */
void __init fsverity_init_signature(void) void __init fsverity_init_signature(void)
{ {
fsverity_keyring = fsverity_keyring =
@ -132,6 +103,4 @@ void __init fsverity_init_signature(void)
KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL); KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL);
if (IS_ERR(fsverity_keyring)) if (IS_ERR(fsverity_keyring))
panic("failed to allocate \".fs-verity\" keyring"); panic("failed to allocate \".fs-verity\" keyring");
fsverity_sysctl_init();
} }