diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-07-29 11:31:46 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-29 11:31:46 -0400 |
| commit | 167225b775d47954d702db4743f9d918aabab0a8 (patch) | |
| tree | e03a05550c87c702fe4c746dd156a8bd38de3651 /include/linux/security.h | |
| parent | b64cc5fb85f38ae7ca3c67a8fea9ad8c0d068bfa (diff) | |
| parent | 2873ead7e46694910ac49c3a8ee0f54956f96e0c (diff) | |
Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 0ae4b147718a..623f90e5f38d 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
| @@ -996,10 +996,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) | |||
| 996 | * Retrieve the LSM-specific secid for the sock to enable caching of network | 996 | * Retrieve the LSM-specific secid for the sock to enable caching of network |
| 997 | * authorizations. | 997 | * authorizations. |
| 998 | * @sock_graft: | 998 | * @sock_graft: |
| 999 | * This hook is called in response to a newly created sock struct being | 999 | * Sets the socket's isec sid to the sock's sid. |
| 1000 | * grafted onto an existing socket and allows the security module to | ||
| 1001 | * perform whatever security attribute management is necessary for both | ||
| 1002 | * the sock and socket. | ||
| 1003 | * @inet_conn_request: | 1000 | * @inet_conn_request: |
| 1004 | * Sets the openreq's sid to socket's sid with MLS portion taken from peer sid. | 1001 | * Sets the openreq's sid to socket's sid with MLS portion taken from peer sid. |
| 1005 | * @inet_csk_clone: | 1002 | * @inet_csk_clone: |