diff options
author | Stephen Smalley <sds@tycho.nsa.gov> | 2006-02-01 06:05:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 11:53:18 -0500 |
commit | 26d2a4be6a56eec575dac651f6606756a971f0fb (patch) | |
tree | 3f27383674706bd535bc67c703827db8ecd5a1dc /security | |
parent | db4c9641def55d36a6f9df79deb8a949292313ca (diff) |
[PATCH] selinux: change file_alloc_security to use GFP_KERNEL
This patch changes the SELinux file_alloc_security function to use
GFP_KERNEL rather than GFP_ATOMIC; the use of GFP_ATOMIC appears to be a
remnant of when this function was being called with the files_lock spinlock
held, and is no longer necessary. Please apply.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 1bb5eea3b8c1..5e61635610bb 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -192,7 +192,7 @@ static int file_alloc_security(struct file *file) | |||
192 | struct task_security_struct *tsec = current->security; | 192 | struct task_security_struct *tsec = current->security; |
193 | struct file_security_struct *fsec; | 193 | struct file_security_struct *fsec; |
194 | 194 | ||
195 | fsec = kzalloc(sizeof(struct file_security_struct), GFP_ATOMIC); | 195 | fsec = kzalloc(sizeof(struct file_security_struct), GFP_KERNEL); |
196 | if (!fsec) | 196 | if (!fsec) |
197 | return -ENOMEM; | 197 | return -ENOMEM; |
198 | 198 | ||