Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 845884d332c060b0dfc54ba5a580d0f1a99c58a2

Authored by Greg Ungerer
Committed by Linus Torvalds
1 parent 082f2c1cc7
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] uclinux: delay binfmt_flat trace 

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>

Showing 1 changed file with 10 additions and 7 deletions Side-by-side Diff

... ... @@ -442,19 +442,22 @@
442 442 flags = ntohl(hdr->flags);
443 443 rev = ntohl(hdr->rev);
444 444  
445   - if (flags & FLAT_FLAG_KTRACE)
446   - printk("BINFMT_FLAT: Loading file: %s\n", bprm->filename);
447   -
448   - if (strncmp(hdr->magic, "bFLT", 4) ||
449   - (rev != FLAT_VERSION && rev != OLD_FLAT_VERSION)) {
  445 + if (strncmp(hdr->magic, "bFLT", 4)) {
450 446 /*
451 447 * because a lot of people do not manage to produce good
452 448 * flat binaries, we leave this printk to help them realise
453 449 * the problem. We only print the error if its not a script file
454 450 */
455 451 if (strncmp(hdr->magic, "#!", 2))
456   - printk("BINFMT_FLAT: bad magic/rev (0x%x, need 0x%x)\n",
457   - rev, (int) FLAT_VERSION);
  452 + printk("BINFMT_FLAT: bad header magic\n");
  453 + return -ENOEXEC;
  454 + }
  455 +
  456 + if (flags & FLAT_FLAG_KTRACE)
  457 + printk("BINFMT_FLAT: Loading file: %s\n", bprm->filename);
  458 +
  459 + if (rev != FLAT_VERSION && rev != OLD_FLAT_VERSION) {
  460 + printk("BINFMT_FLAT: bad flat file version 0x%x (supported 0x%x and 0x%x)\n", rev, FLAT_VERSION, OLD_FLAT_VERSION);
458 461 return -ENOEXEC;
459 462 }
460 463