Commit 9824f75d authored by Jean-Christophe DUBOIS's avatar Jean-Christophe DUBOIS Committed by David Woodhouse

jffs2: allow to discriminate between recoverable and non-recoverable errors

This patch is basically a revert of commit f326966b.

It allows JFFS2 to make the distinction between a potential transient
error (reading or writing the media) and a non recoverable error like a
bad CRC on the extended attribute data or some insconsitent parameters.

In order to make clear that the error is indeed intended to report a
corrupted attribute, a new local error code (JFFS2_XATTR_IS_CORRUPTED)
is introduced rather than returning a confusing positive EIO, which is
what led to the inappropriate "fix" last time.

This error code is never reported to user space and only checked locally
in this file.
Signed-off-by: default avatarJean-Christophe DUBOIS <jcd@tribudubois.net>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 0e618ef0
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#define JFFS2_XATTR_IS_CORRUPTED 1
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/fs.h> #include <linux/fs.h>
...@@ -153,7 +155,7 @@ static int do_verify_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_dat ...@@ -153,7 +155,7 @@ static int do_verify_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_dat
JFFS2_ERROR("node CRC failed at %#08x, read=%#08x, calc=%#08x\n", JFFS2_ERROR("node CRC failed at %#08x, read=%#08x, calc=%#08x\n",
offset, je32_to_cpu(rx.hdr_crc), crc); offset, je32_to_cpu(rx.hdr_crc), crc);
xd->flags |= JFFS2_XFLAGS_INVALID; xd->flags |= JFFS2_XFLAGS_INVALID;
return -EIO; return JFFS2_XATTR_IS_CORRUPTED;
} }
totlen = PAD(sizeof(rx) + rx.name_len + 1 + je16_to_cpu(rx.value_len)); totlen = PAD(sizeof(rx) + rx.name_len + 1 + je16_to_cpu(rx.value_len));
if (je16_to_cpu(rx.magic) != JFFS2_MAGIC_BITMASK if (je16_to_cpu(rx.magic) != JFFS2_MAGIC_BITMASK
...@@ -169,7 +171,7 @@ static int do_verify_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_dat ...@@ -169,7 +171,7 @@ static int do_verify_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_dat
je32_to_cpu(rx.xid), xd->xid, je32_to_cpu(rx.xid), xd->xid,
je32_to_cpu(rx.version), xd->version); je32_to_cpu(rx.version), xd->version);
xd->flags |= JFFS2_XFLAGS_INVALID; xd->flags |= JFFS2_XFLAGS_INVALID;
return -EIO; return JFFS2_XATTR_IS_CORRUPTED;
} }
xd->xprefix = rx.xprefix; xd->xprefix = rx.xprefix;
xd->name_len = rx.name_len; xd->name_len = rx.name_len;
...@@ -227,12 +229,12 @@ static int do_load_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum ...@@ -227,12 +229,12 @@ static int do_load_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum
data[xd->name_len] = '\0'; data[xd->name_len] = '\0';
crc = crc32(0, data, length); crc = crc32(0, data, length);
if (crc != xd->data_crc) { if (crc != xd->data_crc) {
JFFS2_WARNING("node CRC failed (JFFS2_NODETYPE_XREF)" JFFS2_WARNING("node CRC failed (JFFS2_NODETYPE_XATTR)"
" at %#08x, read: 0x%08x calculated: 0x%08x\n", " at %#08x, read: 0x%08x calculated: 0x%08x\n",
ref_offset(xd->node), xd->data_crc, crc); ref_offset(xd->node), xd->data_crc, crc);
kfree(data); kfree(data);
xd->flags |= JFFS2_XFLAGS_INVALID; xd->flags |= JFFS2_XFLAGS_INVALID;
return -EIO; return JFFS2_XATTR_IS_CORRUPTED;
} }
xd->flags |= JFFS2_XFLAGS_HOT; xd->flags |= JFFS2_XFLAGS_HOT;
...@@ -270,7 +272,7 @@ static int load_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *x ...@@ -270,7 +272,7 @@ static int load_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *x
if (xd->xname) if (xd->xname)
return 0; return 0;
if (xd->flags & JFFS2_XFLAGS_INVALID) if (xd->flags & JFFS2_XFLAGS_INVALID)
return -EIO; return JFFS2_XATTR_IS_CORRUPTED;
if (unlikely(is_xattr_datum_unchecked(c, xd))) if (unlikely(is_xattr_datum_unchecked(c, xd)))
rc = do_verify_xattr_datum(c, xd); rc = do_verify_xattr_datum(c, xd);
if (!rc) if (!rc)
...@@ -462,7 +464,7 @@ static int verify_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref ...@@ -462,7 +464,7 @@ static int verify_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref
if (crc != je32_to_cpu(rr.node_crc)) { if (crc != je32_to_cpu(rr.node_crc)) {
JFFS2_ERROR("node CRC failed at %#08x, read=%#08x, calc=%#08x\n", JFFS2_ERROR("node CRC failed at %#08x, read=%#08x, calc=%#08x\n",
offset, je32_to_cpu(rr.node_crc), crc); offset, je32_to_cpu(rr.node_crc), crc);
return -EIO; return JFFS2_XATTR_IS_CORRUPTED;
} }
if (je16_to_cpu(rr.magic) != JFFS2_MAGIC_BITMASK if (je16_to_cpu(rr.magic) != JFFS2_MAGIC_BITMASK
|| je16_to_cpu(rr.nodetype) != JFFS2_NODETYPE_XREF || je16_to_cpu(rr.nodetype) != JFFS2_NODETYPE_XREF
...@@ -472,7 +474,7 @@ static int verify_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref ...@@ -472,7 +474,7 @@ static int verify_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref
offset, je16_to_cpu(rr.magic), JFFS2_MAGIC_BITMASK, offset, je16_to_cpu(rr.magic), JFFS2_MAGIC_BITMASK,
je16_to_cpu(rr.nodetype), JFFS2_NODETYPE_XREF, je16_to_cpu(rr.nodetype), JFFS2_NODETYPE_XREF,
je32_to_cpu(rr.totlen), PAD(sizeof(rr))); je32_to_cpu(rr.totlen), PAD(sizeof(rr)));
return -EIO; return JFFS2_XATTR_IS_CORRUPTED;
} }
ref->ino = je32_to_cpu(rr.ino); ref->ino = je32_to_cpu(rr.ino);
ref->xid = je32_to_cpu(rr.xid); ref->xid = je32_to_cpu(rr.xid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment