Commit 4cd4e4b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1b294a1f dd80c746

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -19968,6 +19968,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/linux/security.h

F:	include/uapi/linux/lsm.h

F:	security/

F:	tools/testing/selftests/lsm/

security/apparmor/lsm.c

+0 −1
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ static struct ctl_table yama_sysctl_table[] = { 
		.extra1         = SYSCTL_ZERO,

		.extra2         = &max_scope,

	},

	{ }

};

static void __init yama_init_sysctl(void)

{