Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] uclinux: delay binfmt_flat trace

Browse source 
Modify the initial trace output (which is based on flags in the binary
header) so that it is not done until after the magic number check.  This
may well not be a flat format binary, so the flags could be invalid.
(Prime example, running a script).

Changes prompted by patches from Stuart Hughs.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Greg Ungerer 2006-01-10 16:59:37 +10:00 committed by Linus Torvalds
parent 082f2c1cc7
commit 845884d332
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fs/binfmt_flat.c
View file

@ -442,19 +442,22 @@ static int load_flat_file(struct linux_binprm * bprm,
flags = ntohl(hdr->flags); flags = ntohl(hdr->flags);
rev = ntohl(hdr->rev); rev = ntohl(hdr->rev);
if (flags & FLAT_FLAG_KTRACE) if (strncmp(hdr->magic, "bFLT", 4)) {
printk("BINFMT_FLAT: Loading file: %s\n", bprm->filename);
if (strncmp(hdr->magic, "bFLT", 4) ||
(rev != FLAT_VERSION && rev != OLD_FLAT_VERSION)) {
/* /*
* because a lot of people do not manage to produce good * because a lot of people do not manage to produce good
* flat binaries, we leave this printk to help them realise * flat binaries, we leave this printk to help them realise
* the problem. We only print the error if its not a script file * the problem. We only print the error if its not a script file
*/ */
if (strncmp(hdr->magic, "#!", 2)) if (strncmp(hdr->magic, "#!", 2))
printk("BINFMT_FLAT: bad magic/rev (0x%x, need 0x%x)\n", printk("BINFMT_FLAT: bad header magic\n");
rev, (int) FLAT_VERSION); return -ENOEXEC;
}
if (flags & FLAT_FLAG_KTRACE)
printk("BINFMT_FLAT: Loading file: %s\n", bprm->filename);
if (rev != FLAT_VERSION && rev != OLD_FLAT_VERSION) {
printk("BINFMT_FLAT: bad flat file version 0x%x (supported 0x%x and 0x%x)\n", rev, FLAT_VERSION, OLD_FLAT_VERSION);
return -ENOEXEC; return -ENOEXEC;
} }