Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f326966b authored by Vasiliy Kulikov's avatar Vasiliy Kulikov Committed by David Woodhouse
Browse files

jffs2: fix error value sign 



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: default avatarVasiliy Kulikov <segoon@openwall.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 23079f94

fs/jffs2/xattr.c

+6 −6
Original line number Diff line number Diff line
@@ -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",

			    offset, je32_to_cpu(rx.hdr_crc), crc);

		xd->flags |= JFFS2_XFLAGS_INVALID;

		return EIO;

		return -EIO;

	}

	totlen = PAD(sizeof(rx) + rx.name_len + 1 + je16_to_cpu(rx.value_len));

	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.version), xd->version);

		xd->flags |= JFFS2_XFLAGS_INVALID;

		return EIO;

		return -EIO;

	}

	xd->xprefix = rx.xprefix;

	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);

		kfree(data);

		xd->flags |= JFFS2_XFLAGS_INVALID;

		return EIO;

		return -EIO;

	}



	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)

		return 0;

	if (xd->flags & JFFS2_XFLAGS_INVALID)

		return EIO;

		return -EIO;

	if (unlikely(is_xattr_datum_unchecked(c, xd)))

		rc = do_verify_xattr_datum(c, xd);

	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)) {

		JFFS2_ERROR("node CRC failed at %#08x, read=%#08x, calc=%#08x\n",

			    offset, je32_to_cpu(rr.node_crc), crc);

		return EIO;

		return -EIO;

	}

	if (je16_to_cpu(rr.magic) != JFFS2_MAGIC_BITMASK

	    || 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,

			    je16_to_cpu(rr.nodetype), JFFS2_NODETYPE_XREF,

			    je32_to_cpu(rr.totlen), PAD(sizeof(rr)));

		return EIO;

		return -EIO;

	}

	ref->ino = je32_to_cpu(rr.ino);

	ref->xid = je32_to_cpu(rr.xid);