diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 13:28:56 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 13:28:56 +1100 |
commit | 59f7856f41b489d83180e570150de852d65bd40d (patch) | |
tree | c9ea3ab825a873fe9e16c988ec9bb00a307795dd /include | |
parent | cf459424e5943979b79a44020c46c9242e1a56ee (diff) | |
parent | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (diff) |
Merge remote branch 'security-testing/next'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/security.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 2c627d361c02..26eca85b2417 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -985,6 +985,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) * Check permissions on incoming network packets. This hook is distinct * from Netfilter's IP input hooks since it is the first time that the * incoming sk_buff @skb has been associated with a particular socket, @sk. + * Must not sleep inside this hook because some callers hold spinlocks. * @sk contains the sock (not socket) associated with the incoming sk_buff. * @skb contains the incoming network data. * @socket_getpeersec_stream: |