Merge tag 'lsm-pr-20240513' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm
Merge commit. Changes below are compared with the first parent: 1b294a1f.
Changes
5 files changed · +4 −4
| File | Status | Add | Del | Content |
|---|---|---|---|---|
| MAINTAINERS | modified | +4 | −0 | View file |
| security/apparmor/lsm.c | modified | +0 | −1 | View file |
| security/keys/sysctl.c | modified | +0 | −1 | View file |
| security/loadpin/loadpin.c | modified | +0 | −1 | View file |
| security/yama/yama_lsm.c | modified | +0 | −1 | View file |
MAINTAINERS
View filediff --git a/MAINTAINERS b/MAINTAINERS
index 94fddfc..0281c76 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19968,6 +19968,10 @@ Q: https://patchwork.kernel.org/project/linux-security-module/list
B: mailto:[email protected]
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/linux/security.h
F: include/uapi/linux/lsm.h
F: security/
F: tools/testing/selftests/lsm/
security/apparmor/lsm.c
View filediff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index cef8c46..6239777 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)
security/keys/sysctl.c
View filediff --git a/security/keys/sysctl.c b/security/keys/sysctl.c
index b348e16..91f000e 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)
security/loadpin/loadpin.c
View filediff --git a/security/loadpin/loadpin.c b/security/loadpin/loadpin.c
index 8e93cda..93fd4d4 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)
security/yama/yama_lsm.c
View filediff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index 49dc52b..b6684a0 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)
{