From 7c432132f05560403272e25a0082cb369d2644df Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Wed, 6 Jan 2010 09:23:54 +0900 Subject: [PATCH] --- yaml --- r: 184897 b: refs/heads/master c: 0ed731859e24cd6e3ec058cf2b49b2a0df80e86b h: refs/heads/master i: 184895: 79714aeed5f42c28ff942c91f09998055ce9baf2 v: v3 --- [refs] | 2 +- trunk/include/linux/security.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 84b9313fdb47..67c6a9761904 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f737d95ddfea4df68a36ffc9231db4bf34b06d13 +refs/heads/master: 0ed731859e24cd6e3ec058cf2b49b2a0df80e86b diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h index 466cbadbd1ef..3696ca345745 100644 --- a/trunk/include/linux/security.h +++ b/trunk/include/linux/security.h @@ -978,6 +978,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: