better corruption check by calculating the number of fill bytes

diff --git a/extract.c b/extract.c
index 1f9c4dd9bd38638ae130eab5d90bb0f49a216875..b4208995f2bc9f8ae73ee6b8811dabfc89e29435 100644 (file)
--- a/extract.c
+++ b/extract.c
@@ -15,6 +15,7 @@
 struct file_entry* get_next_file(unsigned char *fw, int len)
 {
        static unsigned char *pos;
 struct file_entry* get_next_file(unsigned char *fw, int len)
 {
        static unsigned char *pos;

+       static unsigned char *start;

        static unsigned char *end;
        static struct file_entry fent;
        int name_length;
        static unsigned char *end;
        static struct file_entry fent;
        int name_length;


@@ -25,6 +26,7 @@ struct file_entry* get_next_file(unsigned char *fw, int len)
 #if 0
                printf("Start of filesystem: 0x%08x\n", *((unsigned int*)pos));
 #endif
 #if 0
                printf("Start of filesystem: 0x%08x\n", *((unsigned int*)pos));
 #endif

+               start = fw;

                pos = fw + *((unsigned int*)pos);
                end = fw + len;
        }
                pos = fw + *((unsigned int*)pos);
                end = fw + len;
        }


@@ -32,6 +34,28 @@ struct file_entry* get_next_file(unsigned char *fw, int len)
        fent.unknown = *pos;
        pos++;
 
        fent.unknown = *pos;
        pos++;
 

+       if (fent.unknown == 0x00) {
+               /* EOF */
+               int fill = (4 - ((pos - start) % 4)) % 4;
+               int i;
+
+               for (i = 0; i < fill; i++) {
+                       if (*pos != 0xff) {
+                               fprintf(stderr, "Wrong fill byte after EOF: 0x%02x, aborting!\n", *pos);
+                               exit(1);
+                       }
+                       pos++;
+               }
+
+               if (pos != end) {
+                       fprintf(stderr, "EOF marker not at end-of-file %p <-> %p, aborting!\n", pos, end);
+                       exit(1);
+               }
+
+               return NULL;
+       }
+
+

        name_length = *((unsigned int*)pos);
        pos += 4;
 
        name_length = *((unsigned int*)pos);
        pos += 4;
 


@@ -40,10 +64,10 @@ struct file_entry* get_next_file(unsigned char *fw, int len)
 
        if ((fent.length > (end - pos)) ||
            (name_length > (end - pos))) {
 
        if ((fent.length > (end - pos)) ||
            (name_length > (end - pos))) {

-#if 0
-               printf("EOF reached\n");
-#endif
-               return NULL;
+               printf("EOF reached without hitting EOF marker, aborting "
+                       "(unknown: 0x%02x, namelen: 0x%08x, contentlen: 0x%08x!\n",
+                       fent.unknown, name_length, fent.length);
+               exit(1);

        }
 
        fent.name = (char*)pos;
        }
 
        fent.name = (char*)pos;

diff --git a/firmware.c b/firmware.c
index 605611112fbff47ec5d18ac41a4c313b3da84884..aeef48c59a0071abd85baebde44f62363fca307f 100644 (file)
--- a/firmware.c
+++ b/firmware.c
@@ -345,22 +345,17 @@ int check_crc(unsigned char *fw, int len)
        return ret;
 }
 
        return ret;
 }
 

-int check_image(unsigned char *fw, int len)
+void check_image(unsigned char *fw, int len)

 {
        struct file_entry *fent;
        char *last_name = NULL;
 
 {
        struct file_entry *fent;
        char *last_name = NULL;
 

+       /* get_next_file will abort on error */

        fent = get_next_file(fw, len);
        while (fent != NULL) {
                last_name = fent->name;
                fent = get_next_file(NULL, 0);
        }
        fent = get_next_file(fw, len);
        while (fent != NULL) {
                last_name = fent->name;
                fent = get_next_file(NULL, 0);
        }

-
-       if (strcmp(last_name, "pdata")) {
-               return 1;
-       }
-
-       return 0;

 }
 
 int main(int argc, char **argv)
 }
 
 int main(int argc, char **argv)


@@ -451,15 +446,12 @@ int main(int argc, char **argv)
                exit(1);
        }
 
                exit(1);
        }
 

-       if (check_image(fw, statbuf.st_size-4) != 0) {
-               fprintf(stderr, "corrupt firmware image found (pdata is not last entry), aborting!\n");
-               exit(1);
-       }
+       check_image(fw, statbuf.st_size - 4);

 
        if (patch_fw) {
                struct propaction *cpaction = paction;
 
 
        if (patch_fw) {
                struct propaction *cpaction = paction;
 

-               change_properties(fw, statbuf.st_size, paction);
+               change_properties(fw, statbuf.st_size - 4, paction);

 
                printf("\nProperty change results:\n");
                while(cpaction != NULL) {
 
                printf("\nProperty change results:\n");
                while(cpaction != NULL) {


@@ -483,12 +475,12 @@ int main(int argc, char **argv)
        }
 
        if (patch_bd) {
        }
 
        if (patch_bd) {

-               handle_boarddescription(fw, statbuf.st_size -4, 1);
+               handle_boarddescription(fw, statbuf.st_size - 4, 1);

        }
 
        if (showall) {
                show_properties(fw, statbuf.st_size - 4);
        }
 
        if (showall) {
                show_properties(fw, statbuf.st_size - 4);

-               handle_boarddescription(fw, statbuf.st_size -4, 0);
+               handle_boarddescription(fw, statbuf.st_size - 4, 0);

        }
 
        if (extract) {
        }
 
        if (extract) {


@@ -501,10 +493,7 @@ int main(int argc, char **argv)
                        *((unsigned int*)(fw + statbuf.st_size - 4)) = crc;
                }
 
                        *((unsigned int*)(fw + statbuf.st_size - 4)) = crc;
                }
 

-               if (check_image(fw, statbuf.st_size-4) != 0) {
-                       fprintf(stderr, "corrupt firmware image found (pdata is not last entry), aborting!\n");
-                       exit(1);
-               }
+               check_image(fw, statbuf.st_size-4);

 
                if (check_crc(fw, statbuf.st_size) == 0) {
                        char *newfile;
 
                if (check_crc(fw, statbuf.st_size) == 0) {
                        char *newfile;