Skip to content

Commit 4cd4e4b

Browse files
committed
Merge tag 'lsm-pr-20240513' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm
Pull lsm updates from Paul Moore: - The security/* portion of the effort to remove the empty sentinel elements at the end of the ctl_table arrays - Update the file list associated with the LSM / "SECURITY SUBSYSTEM" entry in the MAINTAINERS file (and then fix a typo in then update) * tag 'lsm-pr-20240513' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm: MAINTAINERS: repair file entry in SECURITY SUBSYSTEM MAINTAINERS: update the LSM file list lsm: remove the now superfluous sentinel element from ctl_table array
2 parents 1b294a1 + dd80c74 commit 4cd4e4b

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

MAINTAINERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19968,6 +19968,10 @@ Q: https://patchwork.kernel.org/project/linux-security-module/list
1996819968
B: mailto:linux-security-module@vger.kernel.org
1996919969
P: https://github.com/LinuxSecurityModule/kernel/blob/main/README.md
1997019970
T: git https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
19971+
F: include/linux/lsm_audit.h
19972+
F: include/linux/lsm_hook_defs.h
19973+
F: include/linux/lsm_hooks.h
19974+
F: include/linux/security.h
1997119975
F: include/uapi/linux/lsm.h
1997219976
F: security/
1997319977
F: tools/testing/selftests/lsm/

security/apparmor/lsm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2064,7 +2064,6 @@ static struct ctl_table apparmor_sysctl_table[] = {
20642064
.mode = 0600,
20652065
.proc_handler = apparmor_dointvec,
20662066
},
2067-
{ }
20682067
};
20692068

20702069
static int __init apparmor_init_sysctl(void)

security/keys/sysctl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ static struct ctl_table key_sysctls[] = {
6666
.extra2 = (void *) SYSCTL_INT_MAX,
6767
},
6868
#endif
69-
{ }
7069
};
7170

7271
static int __init init_security_keys_sysctls(void)

security/loadpin/loadpin.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ static struct ctl_table loadpin_sysctl_table[] = {
6363
.extra1 = SYSCTL_ONE,
6464
.extra2 = SYSCTL_ONE,
6565
},
66-
{ }
6766
};
6867

6968
static void set_sysctl(bool is_writable)

security/yama/yama_lsm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,6 @@ static struct ctl_table yama_sysctl_table[] = {
463463
.extra1 = SYSCTL_ZERO,
464464
.extra2 = &max_scope,
465465
},
466-
{ }
467466
};
468467
static void __init yama_init_sysctl(void)
469468
{

0 commit comments

Comments
 (0)