diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-05-02 12:14:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-05-02 12:14:47 +1000 |
| commit | e9792ac6b22b1817e21fcb4d991de932db03738a (patch) | |
| tree | 6b097a809f8b9241f864bd07363cc7792dc66098 | |
| parent | 0f536f2b74f1b978b14e9e3c17ef2ccc082ce007 (diff) | |
| parent | 67889688e05b58b9152c28e417a92bfe577d0ade (diff) | |
| download | linux-next-history-e9792ac6b22b1817e21fcb4d991de932db03738a.tar.gz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
Notice: this object is not reachable from any branch.
Notice: this object is not reachable from any branch.
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | security/apparmor/lsm.c | 1 | ||||
| -rw-r--r-- | security/keys/sysctl.c | 1 | ||||
| -rw-r--r-- | security/loadpin/loadpin.c | 1 | ||||
| -rw-r--r-- | security/yama/yama_lsm.c | 1 |
5 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f5be96ef49c948..9c76adaa11bc98 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19991,6 +19991,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/ diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index cef8c466af80df..6239777090c430 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 b348e1679d5df6..91f000eef3ad82 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 8e93cda130f13c..93fd4d47b334ae 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 49dc52b454efaa..b6684a074a59be 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) { |