X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fcheck.c;h=2b7576e6a27b65d07da9cad0a64e199c165a92a6;hp=5a238a1c48274c507511518bea9d060daaa2e8de;hb=7d6312518bd3a8e4cbad69b1f6b1800f7bcdf68c;hpb=5eaf46e9a0d38c371b50d5dd3a433fc721c1c4dc diff --git a/ccan/tdb2/check.c b/ccan/tdb2/check.c index 5a238a1c..2b7576e6 100644 --- a/ccan/tdb2/check.c +++ b/ccan/tdb2/check.c @@ -1,7 +1,7 @@ - /* + /* Trivial Database 2: free list/block handling Copyright (C) Rusty Russell 2010 - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -34,16 +34,20 @@ static bool check_header(struct tdb_context *tdb, tdb_off_t *recovery) { uint64_t hash_test; struct tdb_header hdr; + enum TDB_ERROR ecode; - if (tdb_read_convert(tdb, 0, &hdr, sizeof(hdr)) == -1) + ecode = tdb_read_convert(tdb, 0, &hdr, sizeof(hdr)); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; return false; + } /* magic food should not be converted, so convert back. */ tdb_convert(tdb, hdr.magic_food, sizeof(hdr.magic_food)); hash_test = TDB_HASH_MAGIC; hash_test = tdb_hash(tdb, &hash_test, sizeof(hash_test)); if (hdr.hash_test != hash_test) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "check: hash test %llu should be %llu", (long long)hdr.hash_test, (long long)hash_test); @@ -51,7 +55,7 @@ static bool check_header(struct tdb_context *tdb, tdb_off_t *recovery) } if (strcmp(hdr.magic_food, TDB_MAGIC_FOOD) != 0) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "check: bad magic '%.*s'", (unsigned)sizeof(hdr.magic_food), hdr.magic_food); return false; @@ -60,7 +64,7 @@ static bool check_header(struct tdb_context *tdb, tdb_off_t *recovery) *recovery = hdr.recovery; if (*recovery) { if (*recovery < sizeof(hdr) || *recovery > tdb->map_size) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: invalid recovery offset %zu", (size_t)*recovery); return false; @@ -91,32 +95,36 @@ static bool check_hash_chain(struct tdb_context *tdb, void *private_data) { struct tdb_used_record rec; + enum TDB_ERROR ecode; - if (tdb_read_convert(tdb, off, &rec, sizeof(rec)) == -1) + ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec)); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; return false; + } if (rec_magic(&rec) != TDB_CHAIN_MAGIC) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: Bad hash chain magic %llu", (long long)rec_magic(&rec)); return false; } if (rec_data_length(&rec) != sizeof(struct tdb_chain)) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: Bad hash chain length %llu vs %zu", (long long)rec_data_length(&rec), sizeof(struct tdb_chain)); return false; } if (rec_key_length(&rec) != 0) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: Bad hash chain key length %llu", (long long)rec_key_length(&rec)); return false; } if (rec_hash(&rec) != 0) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: Bad hash chain hash value %llu", (long long)rec_hash(&rec)); return false; @@ -148,23 +156,27 @@ static bool check_hash_record(struct tdb_context *tdb, void *private_data) { struct tdb_used_record rec; + enum TDB_ERROR ecode; if (hprefix_bits >= 64) return check_hash_chain(tdb, off, hprefix, used, num_used, num_found, check, private_data); - if (tdb_read_convert(tdb, off, &rec, sizeof(rec)) == -1) + ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec)); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; return false; + } if (rec_magic(&rec) != TDB_HTABLE_MAGIC) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: Bad hash table magic %llu", (long long)rec_magic(&rec)); return false; } if (rec_data_length(&rec) != sizeof(tdb_off_t) << TDB_SUBLEVEL_HASH_BITS) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: Bad hash table length %llu vs %llu", (long long)rec_data_length(&rec), (long long)sizeof(tdb_off_t) @@ -172,13 +184,13 @@ static bool check_hash_record(struct tdb_context *tdb, return false; } if (rec_key_length(&rec) != 0) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: Bad hash table key length %llu", (long long)rec_key_length(&rec)); return false; } if (rec_hash(&rec) != 0) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: Bad hash table hash value %llu", (long long)rec_hash(&rec)); return false; @@ -219,6 +231,7 @@ static bool check_hash_tree(struct tdb_context *tdb, unsigned int g, b; const tdb_off_t *hash; struct tdb_used_record rec; + enum TDB_ERROR ecode; hash = tdb_access_read(tdb, off, sizeof(tdb_off_t) @@ -240,7 +253,7 @@ static bool check_hash_tree(struct tdb_context *tdb, p = asearch(&off, used, num_used, off_cmp); if (!p) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: Invalid offset %llu " "in hash", (long long)off); goto fail; @@ -253,7 +266,7 @@ static bool check_hash_tree(struct tdb_context *tdb, /* Chained entries are unordered. */ if (is_subhash(group[b])) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: Invalid chain" " entry subhash"); goto fail; @@ -261,7 +274,7 @@ static bool check_hash_tree(struct tdb_context *tdb, h = hash_record(tdb, off); if (h != hprefix) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "check: bad hash chain" " placement" " 0x%llx vs 0x%llx", @@ -269,15 +282,18 @@ static bool check_hash_tree(struct tdb_context *tdb, (long long)hprefix); goto fail; } - if (tdb_read_convert(tdb, off, &rec, - sizeof(rec))) + ecode = tdb_read_convert(tdb, off, &rec, + sizeof(rec)); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; goto fail; + } goto check; } if (is_subhash(group[b])) { uint64_t subprefix; - subprefix = (hprefix + subprefix = (hprefix << (group_bits + TDB_HASH_GROUP_BITS)) + g * (1 << TDB_HASH_GROUP_BITS) + b; @@ -300,7 +316,7 @@ static bool check_hash_tree(struct tdb_context *tdb, if (get_bits(h, hprefix_bits, &used_bits) != hprefix && hprefix_bits) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "check: bad hash placement" " 0x%llx vs 0x%llx", (long long)h, (long long)hprefix); @@ -310,7 +326,7 @@ static bool check_hash_tree(struct tdb_context *tdb, /* Does it belong in this group? */ if (get_bits(h, group_bits, &used_bits) != g) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "check: bad group %llu vs %u", (long long)h, g); goto fail; @@ -322,7 +338,7 @@ static bool check_hash_tree(struct tdb_context *tdb, != bucket) { used_bits -= TDB_HASH_GROUP_BITS; tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "check: bad bucket %u vs %u", (unsigned)get_bits(h, TDB_HASH_GROUP_BITS, @@ -338,7 +354,7 @@ static bool check_hash_tree(struct tdb_context *tdb, i = (i + 1) % (1 << TDB_HASH_GROUP_BITS)) { if (group[i] == 0) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "check: bad group placement" " %u vs %u", b, bucket); @@ -346,13 +362,16 @@ static bool check_hash_tree(struct tdb_context *tdb, } } - if (tdb_read_convert(tdb, off, &rec, sizeof(rec))) + ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec)); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; goto fail; + } /* Bottom bits must match header. */ if ((h & ((1 << 11)-1)) != rec_hash(&rec)) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: Bad hash magic at" " offset %llu (0x%llx vs 0x%llx)", (long long)off, @@ -403,7 +422,7 @@ static bool check_hash(struct tdb_context *tdb, return false; if (num_found != num_used) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: Not all entries are in hash"); return false; } @@ -416,32 +435,38 @@ static bool check_free(struct tdb_context *tdb, tdb_off_t prev, unsigned int ftable, unsigned int bucket) { + enum TDB_ERROR ecode; + if (frec_magic(frec) != TDB_FREE_MAGIC) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: offset %llu bad magic 0x%llx", (long long)off, (long long)frec->magic_and_prev); return false; } if (frec_ftable(frec) != ftable) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: offset %llu bad freetable %u", (long long)off, frec_ftable(frec)); return false; } - if (tdb->methods->oob(tdb, off - + frec_len(frec) + sizeof(struct tdb_used_record), - false)) + ecode = tdb->methods->oob(tdb, off + + frec_len(frec) + + sizeof(struct tdb_used_record), + false); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; return false; + } if (size_to_bucket(frec_len(frec)) != bucket) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: offset %llu in wrong bucket %u vs %u", (long long)off, bucket, size_to_bucket(frec_len(frec))); return false; } if (prev != frec_prev(frec)) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: offset %llu bad prev %llu vs %llu", (long long)off, (long long)prev, (long long)frec_len(frec)); @@ -449,7 +474,7 @@ static bool check_free(struct tdb_context *tdb, } return true; } - + static bool check_free_table(struct tdb_context *tdb, tdb_off_t ftable_off, unsigned ftable_num, @@ -460,15 +485,19 @@ static bool check_free_table(struct tdb_context *tdb, struct tdb_freetable ft; tdb_off_t h; unsigned int i; + enum TDB_ERROR ecode; - if (tdb_read_convert(tdb, ftable_off, &ft, sizeof(ft)) == -1) + ecode = tdb_read_convert(tdb, ftable_off, &ft, sizeof(ft)); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; return false; + } if (rec_magic(&ft.hdr) != TDB_FTABLE_MAGIC || rec_key_length(&ft.hdr) != 0 || rec_data_length(&ft.hdr) != sizeof(ft) - sizeof(ft.hdr) || rec_hash(&ft.hdr) != 0) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: Invalid header on free table"); return false; } @@ -481,8 +510,11 @@ static bool check_free_table(struct tdb_context *tdb, for (off = tdb_read_off(tdb, h); off; off = f.next) { if (off == TDB_OFF_ERR) return false; - if (tdb_read_convert(tdb, off, &f, sizeof(f))) + ecode = tdb_read_convert(tdb, off, &f, sizeof(f)); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; return false; + } if (!check_free(tdb, off, &f, prev, ftable_num, i)) return false; @@ -490,7 +522,7 @@ static bool check_free_table(struct tdb_context *tdb, p = asearch(&off, fr, num_free, off_cmp); if (!p) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: Invalid offset" " %llu in free table", (long long)off); @@ -509,11 +541,15 @@ static bool check_free_table(struct tdb_context *tdb, size_t dead_space(struct tdb_context *tdb, tdb_off_t off) { size_t len; + enum TDB_ERROR ecode; for (len = 0; off + len < tdb->map_size; len++) { char c; - if (tdb->methods->read(tdb, off, &c, 1)) + ecode = tdb->methods->tread(tdb, off, &c, 1); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; return 0; + } if (c != 0 && c != 0x43) break; } @@ -527,6 +563,7 @@ static bool check_linear(struct tdb_context *tdb, { tdb_off_t off; tdb_len_t len; + enum TDB_ERROR ecode; bool found_recovery = false; for (off = sizeof(struct tdb_header); off < tdb->map_size; off += len) { @@ -536,15 +573,20 @@ static bool check_linear(struct tdb_context *tdb, struct tdb_recovery_record r; } rec; /* r is larger: only get that if we need to. */ - if (tdb_read_convert(tdb, off, &rec, sizeof(rec.f)) == -1) + ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec.f)); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; return false; + } /* If we crash after ftruncate, we can get zeroes or fill. */ if (rec.r.magic == TDB_RECOVERY_INVALID_MAGIC || rec.r.magic == 0x4343434343434343ULL) { - if (tdb_read_convert(tdb, off, &rec, sizeof(rec.r))) + ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec.r)); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; return false; - + } if (recovery == off) { found_recovery = true; len = sizeof(rec.r) + rec.r.max_len; @@ -552,24 +594,27 @@ static bool check_linear(struct tdb_context *tdb, len = dead_space(tdb, off); if (len < sizeof(rec.r)) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: invalid dead" " space at %zu", (size_t)off); return false; } - tdb_logerr(tdb, TDB_SUCCESS, TDB_DEBUG_WARNING, + tdb_logerr(tdb, TDB_SUCCESS, TDB_LOG_WARNING, "Dead space at %zu-%zu (of %zu)", (size_t)off, (size_t)(off + len), (size_t)tdb->map_size); } } else if (rec.r.magic == TDB_RECOVERY_MAGIC) { - if (tdb_read_convert(tdb, off, &rec, sizeof(rec.r))) + ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec.r)); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; return false; + } if (recovery != off) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: unexpected recovery" " record at offset %zu", (size_t)off); @@ -577,14 +622,14 @@ static bool check_linear(struct tdb_context *tdb, } if (rec.r.len > rec.r.max_len) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: invalid recovery length" " %zu", (size_t)rec.r.len); return false; } if (rec.r.eof > tdb->map_size) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: invalid old EOF" " %zu", (size_t)rec.r.eof); return false; @@ -595,7 +640,7 @@ static bool check_linear(struct tdb_context *tdb, len = sizeof(rec.u) + frec_len(&rec.f); if (off + len > tdb->map_size) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: free overlength %llu" " at offset %llu", (long long)len, (long long)off); @@ -603,8 +648,13 @@ static bool check_linear(struct tdb_context *tdb, } /* This record should be in free lists. */ if (frec_ftable(&rec.f) != TDB_FTABLE_NONE - && !append(fr, num_free, off)) + && !append(fr, num_free, off)) { + tdb_logerr(tdb, TDB_ERR_OOM, + TDB_LOG_ERROR, + "tdb_check: tracking %zu'th" + " free record.", *num_free); return false; + } } else if (rec_magic(&rec.u) == TDB_USED_MAGIC || rec_magic(&rec.u) == TDB_CHAIN_MAGIC || rec_magic(&rec.u) == TDB_HTABLE_MAGIC @@ -612,8 +662,13 @@ static bool check_linear(struct tdb_context *tdb, uint64_t klen, dlen, extra; /* This record is used! */ - if (!append(used, num_used, off)) + if (!append(used, num_used, off)) { + tdb_logerr(tdb, TDB_ERR_OOM, + TDB_LOG_ERROR, + "tdb_check: tracking %zu'th" + " used record.", *num_used); return false; + } klen = rec_key_length(&rec.u); dlen = rec_data_length(&rec.u); @@ -622,7 +677,7 @@ static bool check_linear(struct tdb_context *tdb, len = sizeof(rec.u) + klen + dlen + extra; if (off + len > tdb->map_size) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: used overlength %llu" " at offset %llu", (long long)len, (long long)off); @@ -631,7 +686,7 @@ static bool check_linear(struct tdb_context *tdb, if (len < sizeof(rec.f)) { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: too short record %llu" " at %llu", (long long)len, (long long)off); @@ -639,7 +694,7 @@ static bool check_linear(struct tdb_context *tdb, } } else { tdb_logerr(tdb, TDB_ERR_CORRUPT, - TDB_DEBUG_ERROR, + TDB_LOG_ERROR, "tdb_check: Bad magic 0x%llx at offset %zu", (long long)rec_magic(&rec.u), (size_t)off); return false; @@ -648,7 +703,7 @@ static bool check_linear(struct tdb_context *tdb, /* We must have found recovery area if there was one. */ if (recovery != 0 && !found_recovery) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: expected a recovery area at %zu", (size_t)recovery); return false; @@ -663,11 +718,17 @@ int tdb_check(struct tdb_context *tdb, { tdb_off_t *fr = NULL, *used = NULL, ft, recovery; size_t num_free = 0, num_used = 0, num_found = 0, num_ftables = 0; + enum TDB_ERROR ecode; - if (tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false) != 0) + ecode = tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false); + if (ecpde != TDB_SUCCESS) { + tdb->ecode = ecode; return -1; + } - if (tdb_lock_expand(tdb, F_RDLCK) != 0) { + ecode = tdb_lock_expand(tdb, F_RDLCK); + if (ecode != TDB_SUCCESS) { + tdb->ecode = ecode; tdb_allrecord_unlock(tdb, F_RDLCK); return -1; } @@ -693,16 +754,20 @@ int tdb_check(struct tdb_context *tdb, goto fail; if (num_found != num_free) { - tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_DEBUG_ERROR, + tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: Not all entries are in free table"); return -1; } tdb_allrecord_unlock(tdb, F_RDLCK); tdb_unlock_expand(tdb, F_RDLCK); + free(fr); + free(used); return 0; fail: + free(fr); + free(used); tdb_allrecord_unlock(tdb, F_RDLCK); tdb_unlock_expand(tdb, F_RDLCK); return -1;