xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2020-08-11 14:30:36 -07:00
parent 952ace797c bb22d80b47
commit ce13266d97
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/lsm_hook_defs.h
View File

@@ -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: * the LSM framework using the pattern:
* *
* LSM_HOOK(<return_type>, <default_value>, <hook_name>, args...) * LSM_HOOK(<return_type>, <default_value>, <hook_name>, args...)

2
include/linux/lsm_hooks.h
View File

@@ -815,7 +815,7 @@
* structure. Note that the security field was not added directly to the * structure. Note that the security field was not added directly to the
* socket structure, but rather, the socket security information is stored * socket structure, but rather, the socket security information is stored
* in the associated inode. Typically, the inode alloc_security hook will * 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. This hook may be used to update the
* SOCK_INODE(sock)->i_security field with additional information that * SOCK_INODE(sock)->i_security field with additional information that
* wasn't available when the inode was allocated. * wasn't available when the inode was allocated.

2
security/Kconfig
View File

@@ -118,7 +118,7 @@ config INTEL_TXT
it was configured with, especially since they may be responsible for it was configured with, especially since they may be responsible for
providing such assurances to VMs and services running on it. 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. about Intel(R) TXT.
See <http://tboot.sourceforge.net> for more information about tboot. See <http://tboot.sourceforge.net> for more information about tboot.
See Documentation/x86/intel_txt.rst for a description of how to enable See Documentation/x86/intel_txt.rst for a description of how to enable

2
security/apparmor/Kconfig
View File

@@ -77,7 +77,7 @@ config SECURITY_APPARMOR_KUNIT_TEST
This builds the AppArmor KUnit tests. This builds the AppArmor KUnit tests.
KUnit tests run during boot and output the results to the debug log 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 running KUnit test harness and are not for inclusion into a
production build. production build.

2
security/integrity/ima/Kconfig
View File

@@ -26,7 +26,7 @@ config IMA
an aggregate integrity value over this list inside the an aggregate integrity value over this list inside the
TPM hardware, so that the TPM can prove to a third party TPM hardware, so that the TPM can prove to a third party
whether or not critical system files have been modified. 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. to learn more about IMA.
If unsure, say N. If unsure, say N.

2
security/integrity/ima/ima_template.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (C) 2013 Politecnico di Torino, Italy * Copyright (C) 2013 Politecnico di Torino, Italy
* TORSEC group -- http://security.polito.it * TORSEC group -- https://security.polito.it
* *
* Author: Roberto Sassu <roberto.sassu@polito.it> * Author: Roberto Sassu <roberto.sassu@polito.it>
* *

2
security/integrity/ima/ima_template_lib.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (C) 2013 Politecnico di Torino, Italy * Copyright (C) 2013 Politecnico di Torino, Italy
* TORSEC group -- http://security.polito.it * TORSEC group -- https://security.polito.it
* *
* Author: Roberto Sassu <roberto.sassu@polito.it> * Author: Roberto Sassu <roberto.sassu@polito.it>
* *

2
security/integrity/ima/ima_template_lib.h
View File

@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /*
* Copyright (C) 2013 Politecnico di Torino, Italy * Copyright (C) 2013 Politecnico di Torino, Italy
* TORSEC group -- http://security.polito.it * TORSEC group -- https://security.polito.it
* *
* Author: Roberto Sassu <roberto.sassu@polito.it> * Author: Roberto Sassu <roberto.sassu@polito.it>
* *

2
security/keys/encrypted-keys/ecryptfs_format.c
View File

@@ -4,7 +4,7 @@
* *
* Copyright (C) 2006 International Business Machines Corp. * Copyright (C) 2006 International Business Machines Corp.
* Copyright (C) 2010 Politecnico di Torino, Italy * Copyright (C) 2010 Politecnico di Torino, Italy
* TORSEC group -- http://security.polito.it * TORSEC group -- https://security.polito.it
* *
* Authors: * Authors:
* Michael A. Halcrow <mahalcro@us.ibm.com> * Michael A. Halcrow <mahalcro@us.ibm.com>

2
security/keys/encrypted-keys/ecryptfs_format.h
View File

@@ -4,7 +4,7 @@
* *
* Copyright (C) 2006 International Business Machines Corp. * Copyright (C) 2006 International Business Machines Corp.
* Copyright (C) 2010 Politecnico di Torino, Italy * Copyright (C) 2010 Politecnico di Torino, Italy
* TORSEC group -- http://security.polito.it * TORSEC group -- https://security.polito.it
* *
* Authors: * Authors:
* Michael A. Halcrow <mahalcro@us.ibm.com> * Michael A. Halcrow <mahalcro@us.ibm.com>

2
security/keys/encrypted-keys/encrypted.c
View File

@@ -2,7 +2,7 @@
/* /*
* Copyright (C) 2010 IBM Corporation * Copyright (C) 2010 IBM Corporation
* Copyright (C) 2010 Politecnico di Torino, Italy * Copyright (C) 2010 Politecnico di Torino, Italy
* TORSEC group -- http://security.polito.it * TORSEC group -- https://security.polito.it
* *
* Authors: * Authors:
* Mimi Zohar <zohar@us.ibm.com> * Mimi Zohar <zohar@us.ibm.com>

2
security/keys/encrypted-keys/masterkey_trusted.c
View File

@@ -2,7 +2,7 @@
/* /*
* Copyright (C) 2010 IBM Corporation * Copyright (C) 2010 IBM Corporation
* Copyright (C) 2010 Politecnico di Torino, Italy * Copyright (C) 2010 Politecnico di Torino, Italy
* TORSEC group -- http://security.polito.it * TORSEC group -- https://security.polito.it
* *
* Authors: * Authors:
* Mimi Zohar <zohar@us.ibm.com> * Mimi Zohar <zohar@us.ibm.com>