Commit e9cd7dfd authored by Sascha Hauer's avatar Sascha Hauer Committed by Richard Weinberger

ubifs: Do not skip hash checking in data nodes

UBIFS bails out early from try_read_node() when it doesn't have to check
the CRC. Still the node hash has to be checked, otherwise wrong data
could be sneaked into the FS. Fix this by not bailing out early and
always checking the node hash.

Fixes: 16a26b20 ("ubifs: authentication: Add hashes to index nodes")
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent f4844b35
...@@ -479,14 +479,13 @@ static int try_read_node(const struct ubifs_info *c, void *buf, int type, ...@@ -479,14 +479,13 @@ static int try_read_node(const struct ubifs_info *c, void *buf, int type,
if (node_len != len) if (node_len != len)
return 0; return 0;
if (type == UBIFS_DATA_NODE && c->no_chk_data_crc && !c->mounting && if (type != UBIFS_DATA_NODE || !c->no_chk_data_crc || c->mounting ||
!c->remounting_rw) c->remounting_rw) {
return 1; crc = crc32(UBIFS_CRC32_INIT, buf + 8, node_len - 8);
node_crc = le32_to_cpu(ch->crc);
crc = crc32(UBIFS_CRC32_INIT, buf + 8, node_len - 8); if (crc != node_crc)
node_crc = le32_to_cpu(ch->crc); return 0;
if (crc != node_crc) }
return 0;
err = ubifs_node_check_hash(c, buf, zbr->hash); err = ubifs_node_check_hash(c, buf, zbr->hash);
if (err) { if (err) {
......
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