diff options
| author |   James Morris <james.l.morris@oracle.com> | 2014-07-17 03:05:51 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-17 03:05:51 +1000 |
| commit | b6b8a371f5541c2b839caba84fede693f3fcc43d (patch) | |
| tree | 8bee0d6e115133436a2a1781814cbc2e9f72629e /include/linux/security.h | |
| parent | Sync with the changes pushed by Serge in the last merge window. (diff) | |
| parent | selinux: fix the default socket labeling in sock_graft() (diff) | |
| download | linux-dev-b6b8a371f5541c2b839caba84fede693f3fcc43d.tar.xz linux-dev-b6b8a371f5541c2b839caba84fede693f3fcc43d.zip | |
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, 4 insertions, 1 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 9c6b9722ff48..59820f8782a1 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -987,7 +987,10 @@ 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: - * Sets the socket's isec sid to the sock's sid. + * 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. * @inet_conn_request: * Sets the openreq's sid to socket's sid with MLS portion taken from peer sid. * @inet_csk_clone: |