lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jffs2: fix error value sign

Browse Source 
do_verify_xattr_datum(), do_load_xattr_datum(), load_xattr_datum()
and verify_xattr_ref() should return negative value on error.
Sometimes they return EIO that is positive.  Change this to -EIO.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Vasiliy Kulikov
2010-11-14 23:08:39 +03:00
committed by David Woodhouse
parent 23079f94da
commit f326966b3d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/jffs2/xattr.c
View File

@@ -151,7 +151,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 -EIO;
} }
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
@@ -167,7 +167,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 -EIO;
} }
xd->xprefix = rx.xprefix; xd->xprefix = rx.xprefix;
xd->name_len = rx.name_len; xd->name_len = rx.name_len;
@@ -230,7 +230,7 @@ static int do_load_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum
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 -EIO;
} }
xd->flags |= JFFS2_XFLAGS_HOT; xd->flags |= JFFS2_XFLAGS_HOT;
@@ -268,7 +268,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 -EIO;
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)
@@ -460,7 +460,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 -EIO;
} }
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
@@ -470,7 +470,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 -EIO;
} }
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);