AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

futex: fix init order

Browse Source 
When the futex init code fails to initialize the futex pseudo file system it
returns early without initializing the hash queues.  Should the boot succeed
then a futex syscall which tries to enqueue a waiter on the hashqueue will
crash due to the unitilialized plist heads.

Initialize the hash queues before the filesystem.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: Riku Voipio <riku.voipio@movial.fi>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Thomas Gleixner 2008-02-23 15:23:55 -08:00 committed by Linus Torvalds
parent 43fe105a5c
commit 3e4ab747ef
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/futex.c
View File

@ -2145,8 +2145,14 @@ static struct file_system_type futex_fs_type = {
static int __init init(void) static int __init init(void)
{ {
int i = register_filesystem(&futex_fs_type); int i;
for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);
spin_lock_init(&futex_queues[i].lock);
}
i = register_filesystem(&futex_fs_type);
if (i) if (i)
return i; return i;
@ -2156,10 +2162,6 @@ static int __init init(void)
return PTR_ERR(futex_mnt); return PTR_ERR(futex_mnt);
} }
for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);
spin_lock_init(&futex_queues[i].lock);
}
return 0; return 0;
} }
__initcall(init); __initcall(init);