binfmt_mz inclusion to 2.1.35 [PATCH]

Richard Guenther (richard.guenther@student.uni-tuebingen.de)
Sun, 20 Apr 1997 14:11:08 +0200 (MSZ)


Hi everybody!

I noticed, that binfmt_mz was no longer working with 2.1.x, so i decided
to have a look at this.

I merged binfmt_mz into the kernel (no mzloader anymore ;-) ).

The problem is, that i had to change exec.c to behave as 2.0.x:
- sprintf(modname, "binfmt-%04x", *(unsigned short *)(&bprm->buf[2]));
+ sprintf(modname, "binfmt-%04x", *(unsigned short *)(&bprm->buf));

I couldnt understand why we changed this anyway??
(the point is, that the mz magic is only 2 bytes, so we get useless
module requests with the new behaviour -- _bad_ !)

Can anyone look into this?

If no problems turn up, i will send this to Linus next week.

PS: this should apply clean to 2.0.30, too (though i havent tried).
you will have to change the following (in fs/binfmt_mz.c):

static struct linux_binfmt mz_format = {
#ifndef MODULE
NULL, 0, load_mz_binary, NULL, NULL
#else
- NULL, &__this_module, load_mz_binary, NULL, NULL
+ NULL, &mod_use_count_, load_mz_binary, NULL, NULL
#endif

begin 644 patch-2.1.35-binfmt_mz.gz
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
E@.X@"SP+,VSI0"FH%LV(LVEX*_8)ZX'Q<*70?P"XM9*OGQL`````
`
end