alpha: binfmt_aout fix
Subsystems (3)
PATCH 1/1 alpha: binfmt_aout fix
This fixes the problem introduced by commit 3bfacef412 (get rid of special-casing the /sbin/loader on alpha): osf/1 ecoff binary segfaults when binfmt_aout built as module. That happens because aout binary handler gets on the top of the binfmt list due to late registration, and kernel attempts to execute the binary without preparatory work that must be done by binfmt_loader.
Fixed by changing the registration order of the default binfmt handlers using list_add_tail() and introducing insert_binfmt() function which places new handler on the top of the binfmt list. This might be generally useful for installing arch-specific frontends for default handlers or just for overriding them.
--- arch/alpha/kernel/Makefile | 6 +++++- arch/alpha/kernel/binfmt_loader.c | 2 +- fs/exec.c | 7 ++++--- include/linux/binfmts.h | 14 +++++++++++++- 4 files changed, 23 insertions(+), 6 deletions(-)
arch/alpha/kernel/Makefile +5 -1
@@ -8,7 +8,7 @@ EXTRA_CFLAGS := -Werror -Wno-sign-compare obj-y := entry.o traps.o process.o init_task.o osf_sys.o irq.o \ irq_alpha.o signal.o setup.o ptrace.o time.o \ - alpha_ksyms.o systbls.o err_common.o io.o binfmt_loader.o + alpha_ksyms.o systbls.o err_common.o io.o obj-$(CONFIG_VGA_HOSE) += console.o obj-$(CONFIG_SMP) += smp.o
@@ -43,6 +43,10 @@ else # Misc support obj-$(CONFIG_ALPHA_SRM) += srmcons.o +ifdef CONFIG_BINFMT_AOUT +obj-y += binfmt_loader.o +endif + # Core logic support obj-$(CONFIG_ALPHA_APECS) += core_apecs.o obj-$(CONFIG_ALPHA_CIA) += core_cia.o
arch/alpha/kernel/binfmt_loader.c +1 -1
@@ -46,6 +46,6 @@ static struct linux_binfmt loader_format = {static int __init init_loader_binfmt (void ) { -return register_binfmt (&loader_format); +return insert_binfmt (&loader_format); }arch_initcall (init_loader_binfmt);
fs/exec.c +4 -3
@@ -69,17 +69,18 @@ int suid_dumpable = 0;static LIST_HEAD (formats);static DEFINE_RWLOCK (binfmt_lock); -int register_binfmt (struct linux_binfmt * fmt) +int __register_binfmt (struct linux_binfmt * fmt,int insert) {if (!fmt)return -EINVAL ;write_lock (&binfmt_lock); -list_add (&fmt->lh, &formats); + insert ?list_add (&fmt->lh, &formats) : +list_add_tail (&fmt->lh, &formats);write_unlock (&binfmt_lock);return 0 ; } -EXPORT_SYMBOL (register_binfmt); +EXPORT_SYMBOL (__register_binfmt);void unregister_binfmt (struct linux_binfmt * fmt) {
include/linux/binfmts.h +13 -1
@@ -82,7 +82,19 @@ struct linux_binfmt {int hasvdso; }; -extern int register_binfmt (struct linux_binfmt *); +extern int __register_binfmt (struct linux_binfmt *fmt,int insert); + +/* Registration of default binfmt handlers */ +static inline int register_binfmt (struct linux_binfmt *fmt) +{ +return __register_binfmt (fmt,0 ); +} +/* Same as above, but adds a new binfmt at the top of the list */ +static inline int insert_binfmt (struct linux_binfmt *fmt) +{ +return __register_binfmt (fmt,1 ); +} +extern void unregister_binfmt (struct linux_binfmt *);extern int prepare_binprm (struct linux_binprm *);
Al Viro
maintainerQuoted 7 lines · Ivan Kokshaysky
This fixes the problem introduced by commit
3bfacef412(get rid of special-casing the/sbin/loaderon alpha): osf/1 ecoff binary segfaults whenbinfmt_aoutbuilt as module. That happens because aout binary handler gets on the top of the binfmt list due to late registration, and kernel attempts to execute the binary without preparatory work that must be done bybinfmt_loader.
Quoted 5 lines
Fixed by changing the registration order of the default binfmt handlers using
list_add_tail()and introducinginsert_binfmt()function which places new handler on the top of the binfmt list. This might be generally useful for installing arch-specific frontends for default handlers or just for overriding them.
Hmm... How about always doing list_add_tail() instead?
Quoted 8 lines · Al Viro
Quoted 5 lines · Ivan Kokshaysky
Fixed by changing the registration order of the default binfmt handlers using
list_add_tail()and introducinginsert_binfmt()function which places new handler on the top of the binfmt list. This might be generally useful for installing arch-specific frontends for default handlers or just for overriding them.Hmm... How about always doing
list_add_tail()instead?
That would fix the module case, but gets broken when binfmt_aout in built-in, because the generic handlers are registered pretty early (core_initcall) and alpha binfmt_loader is an arch_initcall.
Ivan.
Al Viro
maintainerQuoted 8 lines · Ivan Kokshaysky
Quoted 7 lines · Al Viro
Quoted 5 lines · Ivan Kokshaysky
Fixed by changing the registration order of the default binfmt handlers using
list_add_tail()and introducinginsert_binfmt()function which places new handler on the top of the binfmt list. This might be generally useful for installing arch-specific frontends for default handlers or just for overriding them.
Quoted 5 lines
Quoted 1 line
Hmm... How about always doing
list_add_tail()instead?That would fix the module case, but gets broken when
binfmt_aoutin built-in, because the generic handlers are registered pretty early (core_initcall) and alphabinfmt_loaderis anarch_initcall.
OK, probably the easiest way to deal with that.
ACK