Commit ee3aebdd8f5f8eac41c25c80ceee3d728f920f3b

Authored by Jan Sembera
Committed by Linus Torvalds
1 parent 152e0659fc

binfmt_misc: fix binfmt_misc priority

Commit 74641f584da ("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: Jan 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -724,7 +724,7 @@
724 724 {
725 725 int err = register_filesystem(&bm_fs_type);
726 726 if (!err) {
727   - err = register_binfmt(&misc_format);
  727 + err = insert_binfmt(&misc_format);
728 728 if (err)
729 729 unregister_filesystem(&bm_fs_type);
730 730 }