Author: hailfinger
Date: 2008-07-03 16:40:06 +0200 (Thu, 03 Jul 2008)
New Revision: 3408
Modified:
trunk/util/flashrom/layout.c
Log:
Improve coreboot image detection heuristic in flashrom. It's not
absolutely perfect, but the likelihood of this check to fail is
0.000000000000000000000000013 (1.3*10^-26) which is good enough for me.
Signed-off-by: Carl-Daniel Hailfinger <[EMAIL PROTECTED]>
Acked-by: Stefan Reinauer <[EMAIL PROTECTED]>
Modified: trunk/util/flashrom/layout.c
===================================================================
--- trunk/util/flashrom/layout.c 2008-07-02 17:15:47 UTC (rev 3407)
+++ trunk/util/flashrom/layout.c 2008-07-03 14:40:06 UTC (rev 3408)
@@ -21,6 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
#include <stdint.h>
#include "flash.h"
@@ -57,7 +58,18 @@
walk--;
}
- if ((*walk) == 0 || ((*walk) & 0x3ff) != 0) {
+ /*
+ * Check if coreboot last image size is 0 or not a multiple of 1k or
+ * bigger than the chip or if the pointers to vendor ID or mainboard ID
+ * are outside the image of if the start of ID strings are nonsensical
+ * (nonprintable and not \0).
+ */
+ if ((*walk) == 0 || ((*walk) & 0x3ff) != 0 || *walk > size ||
+ *(walk - 1) > size || *(walk - 2) > size ||
+ (!isprint((const char *)(bios + size - *(walk - 1))) &&
+ ((const char *)(bios + size - *(walk - 1)))) ||
+ (!isprint((const char *)(bios + size - *(walk - 2))) &&
+ ((const char *)(bios + size - *(walk - 2))))) {
printf("Flash image seems to be a legacy BIOS. Disabling
checks.\n");
mainboard_vendor = def_name;
mainboard_part = def_name;
--
coreboot mailing list
[email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
