X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fcheck.c;h=b602d80d64777030aeb08fab853b1df9561561d2;hp=4f340a2e15e7faaa7112a90291fa2945faea510b;hb=ed81f39468c4d9089310fb4950b09c1f5886c4ef;hpb=91505ce279ed86e2575f7f69091638e10659f462 diff --git a/ccan/tdb2/check.c b/ccan/tdb2/check.c index 4f340a2e..b602d80d 100644 --- a/ccan/tdb2/check.c +++ b/ccan/tdb2/check.c @@ -30,7 +30,8 @@ static bool append(tdb_off_t **arr, size_t *num, tdb_off_t off) return true; } -static enum TDB_ERROR check_header(struct tdb_context *tdb, tdb_off_t *recovery) +static enum TDB_ERROR check_header(struct tdb_context *tdb, tdb_off_t *recovery, + uint64_t *features) { uint64_t hash_test; struct tdb_header hdr; @@ -59,6 +60,16 @@ static enum TDB_ERROR check_header(struct tdb_context *tdb, tdb_off_t *recovery) hdr.magic_food); } + /* Features which are used must be a subset of features offered. */ + if (hdr.features_used & ~hdr.features_offered) { + return tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, + "check: features used (0x%llx) which" + " are not offered (0x%llx)", + (long long)hdr.features_used, + (long long)hdr.features_offered); + } + + *features = hdr.features_offered; *recovery = hdr.recovery; if (*recovery) { if (*recovery < sizeof(hdr) || *recovery > tdb->map_size) { @@ -80,7 +91,8 @@ static enum TDB_ERROR check_hash_tree(struct tdb_context *tdb, tdb_off_t used[], size_t num_used, size_t *num_found, - int (*check)(TDB_DATA, TDB_DATA, void *), + enum TDB_ERROR (*check)(TDB_DATA, + TDB_DATA, void *), void *private_data); static enum TDB_ERROR check_hash_chain(struct tdb_context *tdb, @@ -89,7 +101,9 @@ static enum TDB_ERROR check_hash_chain(struct tdb_context *tdb, tdb_off_t used[], size_t num_used, size_t *num_found, - int (*check)(TDB_DATA, TDB_DATA, void *), + enum TDB_ERROR (*check)(TDB_DATA, + TDB_DATA, + void *), void *private_data) { struct tdb_used_record rec; @@ -128,7 +142,7 @@ static enum TDB_ERROR check_hash_chain(struct tdb_context *tdb, ecode = check_hash_tree(tdb, off, 0, hash, 64, used, num_used, num_found, check, private_data); if (ecode != TDB_SUCCESS) { - return false; + return ecode; } off = tdb_read_off(tdb, off + offsetof(struct tdb_chain, next)); @@ -149,7 +163,9 @@ static enum TDB_ERROR check_hash_record(struct tdb_context *tdb, tdb_off_t used[], size_t num_used, size_t *num_found, - int (*check)(TDB_DATA, TDB_DATA, void*), + enum TDB_ERROR (*check)(TDB_DATA, + TDB_DATA, + void *), void *private_data) { struct tdb_used_record rec; @@ -218,7 +234,8 @@ static enum TDB_ERROR check_hash_tree(struct tdb_context *tdb, tdb_off_t used[], size_t num_used, size_t *num_found, - int (*check)(TDB_DATA, TDB_DATA, void *), + enum TDB_ERROR (*check)(TDB_DATA, + TDB_DATA, void *), void *private_data) { unsigned int g, b; @@ -395,8 +412,8 @@ static enum TDB_ERROR check_hash_tree(struct tdb_context *tdb, goto fail; } data.dptr = key.dptr + key.dsize; - if (check(key, data, private_data) != 0) { - ecode = TDB_ERR_CORRUPT; + ecode = check(key, data, private_data); + if (ecode != TDB_SUCCESS) { goto fail; } tdb_access_release(tdb, key.dptr); @@ -520,7 +537,7 @@ static enum TDB_ERROR check_free_table(struct tdb_context *tdb, } ecode = check_free(tdb, off, &f, prev, ftable_num, i); if (ecode != TDB_SUCCESS) { - return false; + return ecode; } /* FIXME: Check hash bits */ @@ -562,7 +579,7 @@ tdb_off_t dead_space(struct tdb_context *tdb, tdb_off_t off) static enum TDB_ERROR check_linear(struct tdb_context *tdb, tdb_off_t **used, size_t *num_used, tdb_off_t **fr, size_t *num_free, - tdb_off_t recovery) + uint64_t features, tdb_off_t recovery) { tdb_off_t off; tdb_len_t len; @@ -691,6 +708,28 @@ static enum TDB_ERROR check_linear(struct tdb_context *tdb, (long long)len, (long long)off); } + + /* Check that records have correct 0 at end (but may + * not in future). */ + if (extra && !features) { + const char *p; + char c; + p = tdb_access_read(tdb, off + sizeof(rec.u) + + klen + dlen, 1, false); + if (TDB_PTR_IS_ERR(p)) + return TDB_PTR_ERR(p); + c = *p; + tdb_access_release(tdb, p); + + if (c != '\0') { + return tdb_logerr(tdb, TDB_ERR_CORRUPT, + TDB_LOG_ERROR, + "tdb_check:" + " non-zero extra" + " at %llu", + (long long)off); + } + } } else { return tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, @@ -711,39 +750,40 @@ static enum TDB_ERROR check_linear(struct tdb_context *tdb, return TDB_SUCCESS; } -int tdb_check(struct tdb_context *tdb, - int (*check)(TDB_DATA key, TDB_DATA data, void *private_data), - void *private_data) +enum TDB_ERROR tdb_check_(struct tdb_context *tdb, + enum TDB_ERROR (*check)(TDB_DATA key, TDB_DATA data, + void *private), + void *private) { tdb_off_t *fr = NULL, *used = NULL, ft, recovery; size_t num_free = 0, num_used = 0, num_found = 0, num_ftables = 0; + uint64_t features; enum TDB_ERROR ecode; ecode = tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false); if (ecode != TDB_SUCCESS) { - tdb->ecode = ecode; - return -1; + return ecode; } ecode = tdb_lock_expand(tdb, F_RDLCK); if (ecode != TDB_SUCCESS) { - tdb->ecode = ecode; tdb_allrecord_unlock(tdb, F_RDLCK); - return -1; + return ecode; } - ecode = check_header(tdb, &recovery); + ecode = check_header(tdb, &recovery, &features); if (ecode != TDB_SUCCESS) goto out; /* First we do a linear scan, checking all records. */ - ecode = check_linear(tdb, &used, &num_used, &fr, &num_free, recovery); + ecode = check_linear(tdb, &used, &num_used, &fr, &num_free, features, + recovery); if (ecode != TDB_SUCCESS) goto out; for (ft = first_ftable(tdb); ft; ft = next_ftable(tdb, ft)) { if (TDB_OFF_IS_ERR(ft)) { - tdb->ecode = ft; + ecode = ft; goto out; } ecode = check_free_table(tdb, ft, num_ftables, fr, num_free, @@ -754,8 +794,7 @@ int tdb_check(struct tdb_context *tdb, } /* FIXME: Check key uniqueness? */ - ecode = check_hash(tdb, used, num_used, num_ftables, check, - private_data); + ecode = check_hash(tdb, used, num_used, num_ftables, check, private); if (ecode != TDB_SUCCESS) goto out; @@ -770,9 +809,5 @@ out: tdb_unlock_expand(tdb, F_RDLCK); free(fr); free(used); - if (ecode != TDB_SUCCESS) { - tdb->ecode = ecode; - return -1; - } - return 0; + return ecode; }