aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/jffs2/readinode.c8
-rw-r--r--fs/jffs2/scan.c12
2 files changed, 5 insertions, 15 deletions
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index 49d4b0a67c55..b09fa23abe53 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -1054,10 +1054,10 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf
1054 jffs2_mark_node_obsolete(c, ref); 1054 jffs2_mark_node_obsolete(c, ref);
1055 goto cont; 1055 goto cont;
1056 } 1056 }
1057 /* Due to poor choice of crc32 seed, an all-zero node will have a correct CRC */ 1057 if (je16_to_cpu(node->u.magic) != JFFS2_MAGIC_BITMASK) {
1058 if (!je32_to_cpu(node->u.hdr_crc) && !je16_to_cpu(node->u.nodetype) && 1058 /* Not a JFFS2 node, whinge and move on */
1059 !je16_to_cpu(node->u.magic) && !je32_to_cpu(node->u.totlen)) { 1059 JFFS2_NOTICE("Wrong magic bitmask 0x%04x in node header at %#08x.\n",
1060 JFFS2_NOTICE("All zero node header at %#08x.\n", ref_offset(ref)); 1060 je16_to_cpu(node->u.magic), ref_offset(ref));
1061 jffs2_mark_node_obsolete(c, ref); 1061 jffs2_mark_node_obsolete(c, ref);
1062 goto cont; 1062 goto cont;
1063 } 1063 }
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index 7a46a436edfc..858e3ed8e23d 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -741,18 +741,8 @@ scan_more:
741 ofs += 4; 741 ofs += 4;
742 continue; 742 continue;
743 } 743 }
744 /* Due to poor choice of crc32 seed, an all-zero node will have a correct CRC */
745 if (!je32_to_cpu(node->hdr_crc) && !je16_to_cpu(node->nodetype) &&
746 !je16_to_cpu(node->magic) && !je32_to_cpu(node->totlen)) {
747 noisy_printk(&noise, "jffs2_scan_eraseblock(): All zero node header at 0x%08x.\n", ofs);
748 if ((err = jffs2_scan_dirty_space(c, jeb, 4)))
749 return err;
750 ofs += 4;
751 continue;
752 }
753 744
754 if (ofs + je32_to_cpu(node->totlen) > 745 if (ofs + je32_to_cpu(node->totlen) > jeb->offset + c->sector_size) {
755 jeb->offset + c->sector_size) {
756 /* Eep. Node goes over the end of the erase block. */ 746 /* Eep. Node goes over the end of the erase block. */
757 printk(KERN_WARNING "Node at 0x%08x with length 0x%08x would run over the end of the erase block\n", 747 printk(KERN_WARNING "Node at 0x%08x with length 0x%08x would run over the end of the erase block\n",
758 ofs, je32_to_cpu(node->totlen)); 748 ofs, je32_to_cpu(node->totlen));