diff options
| author | Jan Sembera <jsembera@suse.cz> | 2010-09-09 16:37:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-09 18:57:24 -0700 |
| commit | ee3aebdd8f5f8eac41c25c80ceee3d728f920f3b (patch) | |
| tree | 13eff87af7c86efa1d216ce7f4f98e81b5dd305f /fs/binfmt_misc.c | |
| parent | 152e0659fc001029c70fa4373af1792b1ae0d01c (diff) | |
| download | linux-stable-ee3aebdd8f5f8eac41c25c80ceee3d728f920f3b.tar.gz linux-stable-ee3aebdd8f5f8eac41c25c80ceee3d728f920f3b.tar.bz2 linux-stable-ee3aebdd8f5f8eac41c25c80ceee3d728f920f3b.zip | |
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>
Diffstat (limited to 'fs/binfmt_misc.c')
| -rw-r--r-- | fs/binfmt_misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index a7528b913936..fd0cc0bf9a40 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -724,7 +724,7 @@ static int __init init_misc_binfmt(void) { int err = register_filesystem(&bm_fs_type); if (!err) { - err = register_binfmt(&misc_format); + err = insert_binfmt(&misc_format); if (err) unregister_filesystem(&bm_fs_type); } |