Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+12 -12
+1 -1
include/linux/lsm_hook_defs.h
··· 15 15 */ 16 16 17 17 /* 18 - * The macro LSM_HOOK is used to define the data structures required by the 18 + * The macro LSM_HOOK is used to define the data structures required by 19 19 * the LSM framework using the pattern: 20 20 * 21 21 * LSM_HOOK(<return_type>, <default_value>, <hook_name>, args...)
+1 -1
include/linux/lsm_hooks.h
··· 815 815 * structure. Note that the security field was not added directly to the 816 816 * socket structure, but rather, the socket security information is stored 817 817 * in the associated inode. Typically, the inode alloc_security hook will 818 - * allocate and and attach security information to 818 + * allocate and attach security information to 819 819 * SOCK_INODE(sock)->i_security. This hook may be used to update the 820 820 * SOCK_INODE(sock)->i_security field with additional information that 821 821 * wasn't available when the inode was allocated.
+1 -1
security/Kconfig
··· 118 118 it was configured with, especially since they may be responsible for 119 119 providing such assurances to VMs and services running on it. 120 120 121 - See <http://www.intel.com/technology/security/> for more information 121 + See <https://www.intel.com/technology/security/> for more information 122 122 about Intel(R) TXT. 123 123 See <http://tboot.sourceforge.net> for more information about tboot. 124 124 See Documentation/x86/intel_txt.rst for a description of how to enable
+1 -1
security/apparmor/Kconfig
··· 77 77 This builds the AppArmor KUnit tests. 78 78 79 79 KUnit tests run during boot and output the results to the debug log 80 - in TAP format (http://testanything.org/). Only useful for kernel devs 80 + in TAP format (https://testanything.org/). Only useful for kernel devs 81 81 running KUnit test harness and are not for inclusion into a 82 82 production build. 83 83
+1 -1
security/integrity/ima/Kconfig
··· 26 26 an aggregate integrity value over this list inside the 27 27 TPM hardware, so that the TPM can prove to a third party 28 28 whether or not critical system files have been modified. 29 - Read <http://www.usenix.org/events/sec04/tech/sailer.html> 29 + Read <https://www.usenix.org/events/sec04/tech/sailer.html> 30 30 to learn more about IMA. 31 31 If unsure, say N. 32 32
+1 -1
security/integrity/ima/ima_template.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0-only 2 2 /* 3 3 * Copyright (C) 2013 Politecnico di Torino, Italy 4 - * TORSEC group -- http://security.polito.it 4 + * TORSEC group -- https://security.polito.it 5 5 * 6 6 * Author: Roberto Sassu <roberto.sassu@polito.it> 7 7 *
+1 -1
security/integrity/ima/ima_template_lib.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0-only 2 2 /* 3 3 * Copyright (C) 2013 Politecnico di Torino, Italy 4 - * TORSEC group -- http://security.polito.it 4 + * TORSEC group -- https://security.polito.it 5 5 * 6 6 * Author: Roberto Sassu <roberto.sassu@polito.it> 7 7 *
+1 -1
security/integrity/ima/ima_template_lib.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0-only */ 2 2 /* 3 3 * Copyright (C) 2013 Politecnico di Torino, Italy 4 - * TORSEC group -- http://security.polito.it 4 + * TORSEC group -- https://security.polito.it 5 5 * 6 6 * Author: Roberto Sassu <roberto.sassu@polito.it> 7 7 *
+1 -1
security/keys/encrypted-keys/ecryptfs_format.c
··· 4 4 * 5 5 * Copyright (C) 2006 International Business Machines Corp. 6 6 * Copyright (C) 2010 Politecnico di Torino, Italy 7 - * TORSEC group -- http://security.polito.it 7 + * TORSEC group -- https://security.polito.it 8 8 * 9 9 * Authors: 10 10 * Michael A. Halcrow <mahalcro@us.ibm.com>
+1 -1
security/keys/encrypted-keys/ecryptfs_format.h
··· 4 4 * 5 5 * Copyright (C) 2006 International Business Machines Corp. 6 6 * Copyright (C) 2010 Politecnico di Torino, Italy 7 - * TORSEC group -- http://security.polito.it 7 + * TORSEC group -- https://security.polito.it 8 8 * 9 9 * Authors: 10 10 * Michael A. Halcrow <mahalcro@us.ibm.com>
+1 -1
security/keys/encrypted-keys/encrypted.c
··· 2 2 /* 3 3 * Copyright (C) 2010 IBM Corporation 4 4 * Copyright (C) 2010 Politecnico di Torino, Italy 5 - * TORSEC group -- http://security.polito.it 5 + * TORSEC group -- https://security.polito.it 6 6 * 7 7 * Authors: 8 8 * Mimi Zohar <zohar@us.ibm.com>
+1 -1
security/keys/encrypted-keys/masterkey_trusted.c
··· 2 2 /* 3 3 * Copyright (C) 2010 IBM Corporation 4 4 * Copyright (C) 2010 Politecnico di Torino, Italy 5 - * TORSEC group -- http://security.polito.it 5 + * TORSEC group -- https://security.polito.it 6 6 * 7 7 * Authors: 8 8 * Mimi Zohar <zohar@us.ibm.com>