X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fcheck.c;h=577086689f373f75c1774d9be2fd1175180af950;hp=9bbd12645f199ba6a5a62708caccc79d08cf16d1;hb=086a4e1915a8307c08320900df0099842a894135;hpb=a0e0927e1f34d80fd4d4ee2d68fa2acb94ae9eb2 diff --git a/ccan/tdb2/check.c b/ccan/tdb2/check.c index 9bbd1264..57708668 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,9 +60,20 @@ 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) { + if (*recovery < sizeof(hdr) + || *recovery > tdb->file->map_size) { return tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check:" " invalid recovery offset %zu", @@ -390,22 +402,26 @@ static enum TDB_ERROR check_hash_tree(struct tdb_context *tdb, check: if (check) { TDB_DATA key, data; - key.dsize = rec_key_length(&rec); - data.dsize = rec_data_length(&rec); - key.dptr = (void *)tdb_access_read(tdb, - off + sizeof(rec), - key.dsize + data.dsize, - false); - if (TDB_PTR_IS_ERR(key.dptr)) { - ecode = TDB_PTR_ERR(key.dptr); + const unsigned char *kptr; + + kptr = tdb_access_read(tdb, + off + sizeof(rec), + rec_key_length(&rec) + + rec_data_length(&rec), + false); + if (TDB_PTR_IS_ERR(kptr)) { + ecode = TDB_PTR_ERR(kptr); goto fail; } - data.dptr = key.dptr + key.dsize; + + key = tdb_mkdata(kptr, rec_key_length(&rec)); + data = tdb_mkdata(kptr + key.dsize, + rec_data_length(&rec)); ecode = check(key, data, private_data); + tdb_access_release(tdb, kptr); if (ecode != TDB_SUCCESS) { goto fail; } - tdb_access_release(tdb, key.dptr); } } } @@ -553,7 +569,7 @@ tdb_off_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++) { + for (len = 0; off + len < tdb->file->map_size; len++) { char c; ecode = tdb->methods->tread(tdb, off, &c, 1); if (ecode != TDB_SUCCESS) { @@ -568,14 +584,16 @@ 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; enum TDB_ERROR ecode; bool found_recovery = false; - for (off = sizeof(struct tdb_header); off < tdb->map_size; off += len) { + for (off = sizeof(struct tdb_header); + off < tdb->file->map_size; + off += len) { union { struct tdb_used_record u; struct tdb_free_record f; @@ -613,7 +631,7 @@ static enum TDB_ERROR check_linear(struct tdb_context *tdb, 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); + (size_t)tdb->file->map_size); } } else if (rec.r.magic == TDB_RECOVERY_MAGIC) { ecode = tdb_read_convert(tdb, off, &rec, sizeof(rec.r)); @@ -635,7 +653,7 @@ static enum TDB_ERROR check_linear(struct tdb_context *tdb, " length %zu", (size_t)rec.r.len); } - if (rec.r.eof > tdb->map_size) { + if (rec.r.eof > tdb->file->map_size) { return tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: invalid old EOF" @@ -645,7 +663,7 @@ static enum TDB_ERROR check_linear(struct tdb_context *tdb, len = sizeof(rec.r) + rec.r.max_len; } else if (frec_magic(&rec.f) == TDB_FREE_MAGIC) { len = sizeof(rec.u) + frec_len(&rec.f); - if (off + len > tdb->map_size) { + if (off + len > tdb->file->map_size) { return tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: free overlength" @@ -680,7 +698,7 @@ static enum TDB_ERROR check_linear(struct tdb_context *tdb, extra = rec_extra_padding(&rec.u); len = sizeof(rec.u) + klen + dlen + extra; - if (off + len > tdb->map_size) { + if (off + len > tdb->file->map_size) { return tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb_check: used overlength" @@ -697,6 +715,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, @@ -724,25 +764,27 @@ enum TDB_ERROR 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; + uint64_t features; enum TDB_ERROR ecode; ecode = tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false); if (ecode != TDB_SUCCESS) { - return ecode; + return tdb->last_error = ecode; } ecode = tdb_lock_expand(tdb, F_RDLCK); if (ecode != TDB_SUCCESS) { tdb_allrecord_unlock(tdb, F_RDLCK); - return ecode; + return tdb->last_error = 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; @@ -774,5 +816,5 @@ out: tdb_unlock_expand(tdb, F_RDLCK); free(fr); free(used); - return ecode; + return tdb->last_error = ecode; }