summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-07-29 19:31:46 +0400
committerJames Morris <james.l.morris@oracle.com>2014-07-29 19:31:46 +0400
commit167225b775d47954d702db4743f9d918aabab0a8 (patch)
treee03a05550c87c702fe4c746dd156a8bd38de3651 /include
parentb64cc5fb85f38ae7ca3c67a8fea9ad8c0d068bfa (diff)
parent2873ead7e46694910ac49c3a8ee0f54956f96e0c (diff)
downloadlinux-167225b775d47954d702db4743f9d918aabab0a8.tar.xz
Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'include')
-rw-r--r--include/linux/security.h5
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)
* Retrieve the LSM-specific secid for the sock to enable caching of network
* authorizations.
* @sock_graft:
- * This hook is called in response to a newly created sock struct being
- * grafted onto an existing socket and allows the security module to
- * perform whatever security attribute management is necessary for both
- * the sock and socket.
+ * Sets the socket's isec sid to the sock's sid.
* @inet_conn_request:
* Sets the openreq's sid to socket's sid with MLS portion taken from peer sid.
* @inet_csk_clone: