Commit e2a366dc authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds
Browse files

FLAT binaries: drop BINFMT_FLAT bad header magic warning 



The warning issued by fs/binfmt_flat.c when the format handler is given a
non-FLAT and non-script executable is annoying to say the least when working
with FDPIC ELF objects.  If you build a kernel that supports both FLAT and
FDPIC ELFs on no-mmu, every time you execute an FDPIC ELF, the kernel spits
out this message.  While I understand a lot of newcomers to the no-mmu world
screw up generation of FLAT binaries, this warning is not usable for systems
that support more than just FLAT.

Signed-off-by: default avatarJie Zhang <jie.zhang@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Cc: Bernd Schmidt <bernds_cb1@t-online.de>
Acked-by: default avatarGreg Ungerer <gerg@snapgear.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2cd9cdce

fs/binfmt_flat.c

+4 −4
Original line number Diff line number Diff line
@@ -443,12 +443,12 @@ static int load_flat_file(struct linux_binprm * bprm, 


	if (strncmp(hdr->magic, "bFLT", 4)) {

		/*

		 * Previously, here was a printk to tell people

		 *   "BINFMT_FLAT: bad header magic".

		 * But for the kernel which also use ELF FD-PIC format, this

		 * error message is confusing.

		 * because a lot of people do not manage to produce good

		 * flat binaries,  we leave this printk to help them realise

		 * the problem.  We only print the error if its not a script file

		 */

		if (strncmp(hdr->magic, "#!", 2))

			printk("BINFMT_FLAT: bad header magic\n");

		ret = -ENOEXEC;

		goto err;

	}