Commit ee3aebdd authored by Jan Sembera's avatar Jan Sembera Committed by Linus Torvalds

binfmt_misc: fix binfmt_misc priority

Commit 74641f58 ("alpha: binfmt_aout fix") (May 2009) introduced a
regression - binfmt_misc is now consulted after binfmt_elf, which will
unfortunately break ia32el.  ia32 ELF binaries on ia64 used to be matched
using binfmt_misc and executed using wrapper.  As 32bit binaries are now
matched by binfmt_elf before bindmt_misc kicks in, the wrapper is ignored.

The fix increases precedence of binfmt_misc to the original state.
Signed-off-by: default avatarJan Sembera <jsembera@suse.cz>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Richard Henderson <rth@twiddle.net
Cc: <stable@kernel.org>		[2.6.everything.x]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 152e0659
...@@ -724,7 +724,7 @@ static int __init init_misc_binfmt(void) ...@@ -724,7 +724,7 @@ static int __init init_misc_binfmt(void)
{ {
int err = register_filesystem(&bm_fs_type); int err = register_filesystem(&bm_fs_type);
if (!err) { if (!err) {
err = register_binfmt(&misc_format); err = insert_binfmt(&misc_format);
if (err) if (err)
unregister_filesystem(&bm_fs_type); unregister_filesystem(&bm_fs_type);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment