mirror of
https://github.com/torvalds/linux
synced 2024-07-25 04:30:21 +00:00
fsverity: use register_sysctl_init() to avoid kmemleak warning
Since the fsverity sysctl registration runs as a builtin initcall, there is no corresponding sysctl deregistration and the resulting struct ctl_table_header is not used. This can cause a kmemleak warning just after the system boots up. (A pointer to the ctl_table_header is stored in the fsverity_sysctl_header static variable, which kmemleak should detect; however, the compiler can optimize out that variable.) Avoid the kmemleak warning by using register_sysctl_init() which is intended for use by builtin initcalls and uses kmemleak_not_leak(). Reported-by: Yi Zhang <yi.zhang@redhat.com> Closes: https://lore.kernel.org/r/CAHj4cs8DTSvR698UE040rs_pX1k-WVe7aR6N2OoXXuhXJPDC-w@mail.gmail.com Cc: stable@vger.kernel.org Reviewed-by: Joel Granados <j.granados@samsung.com> Link: https://lore.kernel.org/r/20240501025331.594183-1-ebiggers@kernel.org Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
parent
e67572cd22
commit
ee5814ddde
|
@ -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[] = {
|
||||||
|
|
||||||
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)
|
||||||
|
|
Loading…
Reference in a new issue