From 74560bb3685b3600da911d92d134899ce9f8bcc1 Mon Sep 17 00:00:00 2001 From: Joel Granados Date: Thu, 28 Mar 2024 16:57:49 +0100 Subject: [PATCH 1/3] lsm: remove the now superfluous sentinel element from ctl_table array This commit comes at the tail end of a greater effort to remove the empty elements at the end of the ctl_table arrays (sentinels) which will reduce the overall build time size of the kernel and run time memory bloat by ~64 bytes per sentinel (further information Link : https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@bombadil.infradead.org/) Remove the sentinel from all files under security/ that register a sysctl table. Signed-off-by: Joel Granados Acked-by: Kees Cook # loadpin & yama Tested-by: Valentin Schneider Reviewed-by: Valentin Schneider [PM: subject line tweaks] Signed-off-by: Paul Moore --- security/apparmor/lsm.c | 1 - security/keys/sysctl.c | 1 - security/loadpin/loadpin.c | 1 - security/yama/yama_lsm.c | 1 - 4 files changed, 4 deletions(-) diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index cef8c466af80..6239777090c4 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -2064,7 +2064,6 @@ static struct ctl_table apparmor_sysctl_table[] = { .mode = 0600, .proc_handler = apparmor_dointvec, }, - { } }; static int __init apparmor_init_sysctl(void) diff --git a/security/keys/sysctl.c b/security/keys/sysctl.c index b348e1679d5d..91f000eef3ad 100644 --- a/security/keys/sysctl.c +++ b/security/keys/sysctl.c @@ -66,7 +66,6 @@ static struct ctl_table key_sysctls[] = { .extra2 = (void *) SYSCTL_INT_MAX, }, #endif - { } }; static int __init init_security_keys_sysctls(void) diff --git a/security/loadpin/loadpin.c b/security/loadpin/loadpin.c index 8e93cda130f1..93fd4d47b334 100644 --- a/security/loadpin/loadpin.c +++ b/security/loadpin/loadpin.c @@ -63,7 +63,6 @@ static struct ctl_table loadpin_sysctl_table[] = { .extra1 = SYSCTL_ONE, .extra2 = SYSCTL_ONE, }, - { } }; static void set_sysctl(bool is_writable) diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c index 49dc52b454ef..b6684a074a59 100644 --- a/security/yama/yama_lsm.c +++ b/security/yama/yama_lsm.c @@ -463,7 +463,6 @@ static struct ctl_table yama_sysctl_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = &max_scope, }, - { } }; static void __init yama_init_sysctl(void) { From 67889688e05b58b9152c28e417a92bfe577d0ade Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Wed, 1 May 2024 12:02:45 -0400 Subject: [PATCH 2/3] MAINTAINERS: update the LSM file list The LSM entry was missing a number of files under include/. Signed-off-by: Paul Moore --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index aa3b947fb080..f7d67854b9e1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19818,6 +19818,10 @@ Q: https://patchwork.kernel.org/project/linux-security-module/list B: mailto:linux-security-module@vger.kernel.org P: https://github.com/LinuxSecurityModule/kernel/blob/main/README.md T: git https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git +F: include/linux/lsm_audit.h +F: include/linux/lsm_hook_defs.h +F: include/linux/lsm_hooks.h +F: include/security.h F: include/uapi/linux/lsm.h F: security/ F: tools/testing/selftests/lsm/ From dd80c7465029dd0671e6f9fc2678ae0fbdf785ac Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 7 May 2024 16:01:22 +0200 Subject: [PATCH 3/3] MAINTAINERS: repair file entry in SECURITY SUBSYSTEM Commit 67889688e05b ("MAINTAINERS: update the LSM file list") adds a few file entries to lsm-related header files. Among them, there is a reference to include/security.h. However, security.h is located in include/linux/, not in include/. Hence, ./scripts/get_maintainer.pl --self-test=patterns complains about a broken reference. Repair this new file entry in the SECURITY SUBSYSTEM section. Signed-off-by: Lukas Bulwahn Signed-off-by: Paul Moore --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index f7d67854b9e1..bd732b174568 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19821,7 +19821,7 @@ T: git https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git F: include/linux/lsm_audit.h F: include/linux/lsm_hook_defs.h F: include/linux/lsm_hooks.h -F: include/security.h +F: include/linux/security.h F: include/uapi/linux/lsm.h F: security/ F: tools/testing/selftests/lsm/