diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-02-24 02:10:06 +0000 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-03-24 11:47:18 -0700 |
| commit | c51d3bbd2c2256e2567984068bc0950b4ac73e49 (patch) | |
| tree | b423f0f10db9a213d48ad6fd62a27d720f76ef33 | |
| parent | e08b12e87e90a96df9380e8b17424e939c9f3448 (diff) | |
futex: fix init order
commit: 3e4ab747efa8e78562ec6782b08bbf21a00aba1b
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | kernel/futex.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 55d78b5a9622..176cddb6dbe9 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2123,8 +2123,14 @@ static struct file_system_type futex_fs_type = { 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) return i; @@ -2134,10 +2140,6 @@ static int __init init(void) 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; } __initcall(init); |