Commit ce13266d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull security subsystem updates from James Morris:
 "A couple of minor documentation updates only for this release"

* tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  LSM: drop duplicated words in header file comments
  Replace HTTP links with HTTPS ones: security
parents 952ace79 bb22d80b

include/linux/lsm_hook_defs.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */



/*

 * The macro LSM_HOOK is used to define the data structures required by the

 * The macro LSM_HOOK is used to define the data structures required by

 * the LSM framework using the pattern:

 *

 *	LSM_HOOK(<return_type>, <default_value>, <hook_name>, args...)

include/linux/lsm_hooks.h

+1 −1
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ 
 *	structure. Note that the security field was not added directly to the

 *	socket structure, but rather, the socket security information is stored

 *	in the associated inode.  Typically, the inode alloc_security hook will

 *	allocate and and attach security information to

 *	allocate and attach security information to

 *	SOCK_INODE(sock)->i_security.  This hook may be used to update the

 *	SOCK_INODE(sock)->i_security field with additional information that

 *	wasn't available when the inode was allocated.

security/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ config INTEL_TXT 
	  it was configured with, especially since they may be responsible for

	  providing such assurances to VMs and services running on it.



	  See <http://www.intel.com/technology/security/> for more information

	  See <https://www.intel.com/technology/security/> for more information

	  about Intel(R) TXT.

	  See <http://tboot.sourceforge.net> for more information about tboot.

	  See Documentation/x86/intel_txt.rst for a description of how to enable

security/apparmor/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ config SECURITY_APPARMOR_KUNIT_TEST 
	  This builds the AppArmor KUnit tests.



	  KUnit tests run during boot and output the results to the debug log

	  in TAP format (http://testanything.org/). Only useful for kernel devs

	  in TAP format (https://testanything.org/). Only useful for kernel devs

	  running KUnit test harness and are not for inclusion into a

	  production build.

security/integrity/ima/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ config IMA 
	  an aggregate integrity value over this list inside the

	  TPM hardware, so that the TPM can prove to a third party

	  whether or not critical system files have been modified.

	  Read <http://www.usenix.org/events/sec04/tech/sailer.html>

	  Read <https://www.usenix.org/events/sec04/tech/sailer.html>

	  to learn more about IMA.

	  If unsure, say N.

CRA Git | Maintained and supported by SUSTech CRA and CCSE