Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[JFFS2] Fix readinode failure when read_dnode() detects CRC failure.

Browse Source 
We should have stopped returning 1 from read_dnode() to indicate
failure. We can just mark the damn thing obsolete immediately. But I
missed a case where we don't.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse 2007-07-03 16:51:19 -04:00 committed by David Woodhouse
parent ba609a9d97
commit e2baf4ed16
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/jffs2/readinode.c
View File

@ -210,8 +210,7 @@ static void jffs2_kill_tn(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info *
* offset, and the one with the smallest length will come first in the * offset, and the one with the smallest length will come first in the
* ordering. * ordering.
* *
* Returns 0 if the node was inserted * Returns 0 if the node was handled (including marking it obsolete)
* 1 if the node is obsolete (because we can't mark it so yet)
* < 0 an if error occurred * < 0 an if error occurred
*/ */
static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c, static int jffs2_add_tn_to_tree(struct jffs2_sb_info *c,
@ -572,8 +571,7 @@ static struct jffs2_raw_node_ref *jffs2_first_valid_node(struct jffs2_raw_node_r
* Helper function for jffs2_get_inode_nodes(). * Helper function for jffs2_get_inode_nodes().
* It is called every time an directory entry node is found. * It is called every time an directory entry node is found.
* *
* Returns: 0 on succes; * Returns: 0 on success;
* 1 if the node should be marked obsolete;
* negative error code on failure. * negative error code on failure.
*/ */
static inline int read_direntry(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref, static inline int read_direntry(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref,
@ -680,8 +678,7 @@ static inline int read_direntry(struct jffs2_sb_info *c, struct jffs2_raw_node_r
* Helper function for jffs2_get_inode_nodes(). * Helper function for jffs2_get_inode_nodes().
* It is called every time an inode node is found. * It is called every time an inode node is found.
* *
* Returns: 0 on success; * Returns: 0 on success (possibly after marking a bad node obsolete);
* 1 if the node should be marked obsolete;
* negative error code on failure. * negative error code on failure.
*/ */
static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref, static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref,
@ -690,7 +687,7 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
{ {
struct jffs2_tmp_dnode_info *tn; struct jffs2_tmp_dnode_info *tn;
uint32_t len, csize; uint32_t len, csize;
int ret = 1; int ret = 0;
uint32_t crc; uint32_t crc;
/* Obsoleted. This cannot happen, surely? dwmw2 20020308 */ /* Obsoleted. This cannot happen, surely? dwmw2 20020308 */
@ -719,8 +716,9 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
/* Sanity checks */ /* Sanity checks */
if (unlikely(je32_to_cpu(rd->offset) > je32_to_cpu(rd->isize)) || if (unlikely(je32_to_cpu(rd->offset) > je32_to_cpu(rd->isize)) ||
unlikely(PAD(je32_to_cpu(rd->csize) + sizeof(*rd)) != PAD(je32_to_cpu(rd->totlen)))) { unlikely(PAD(je32_to_cpu(rd->csize) + sizeof(*rd)) != PAD(je32_to_cpu(rd->totlen)))) {
JFFS2_WARNING("inode node header CRC is corrupted at %#08x\n", ref_offset(ref)); JFFS2_WARNING("inode node header CRC is corrupted at %#08x\n", ref_offset(ref));
jffs2_dbg_dump_node(c, ref_offset(ref)); jffs2_dbg_dump_node(c, ref_offset(ref));
jffs2_mark_node_obsolete(c, ref);
goto free_out; goto free_out;
} }
@ -775,6 +773,7 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
if (len >= csize && unlikely(tn->partial_crc != je32_to_cpu(rd->data_crc))) { if (len >= csize && unlikely(tn->partial_crc != je32_to_cpu(rd->data_crc))) {
JFFS2_NOTICE("wrong data CRC in data node at 0x%08x: read %#08x, calculated %#08x.\n", JFFS2_NOTICE("wrong data CRC in data node at 0x%08x: read %#08x, calculated %#08x.\n",
ref_offset(ref), tn->partial_crc, je32_to_cpu(rd->data_crc)); ref_offset(ref), tn->partial_crc, je32_to_cpu(rd->data_crc));
jffs2_mark_node_obsolete(c, ref);
goto free_out; goto free_out;
} }
@ -854,7 +853,6 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
* It is called every time an unknown node is found. * It is called every time an unknown node is found.
* *
* Returns: 0 on success; * Returns: 0 on success;
* 1 if the node should be marked obsolete;
* negative error code on failure. * negative error code on failure.
*/ */
static inline int read_unknown(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref, struct jffs2_unknown_node *un) static inline int read_unknown(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref, struct jffs2_unknown_node *un)
@ -1088,10 +1086,7 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf
} }
err = read_unknown(c, ref, &node->u); err = read_unknown(c, ref, &node->u);
if (err == 1) { if (unlikely(err))
jffs2_mark_node_obsolete(c, ref);
break;
} else if (unlikely(err))
goto free_out; goto free_out;
} }