From 786b7263000dedcb97e7369402e2e9dc967e36c4 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 13 Sep 2010 20:05:59 +0930 Subject: tdb: put example hashes into header, so we notice incorrect hash_fn. This is Stefan Metzmacher 's patch with minor changes: 1) Use the TDB_MAGIC constant so both hashes aren't of strings. 2) Check the hash in tdb_check (paranoia, really). 3) Additional check in the (unlikely!) case where both examples hash to 0. 4) Cosmetic changes to var names and complaint message. Signed-off-by: Rusty Russell --- lib/tdb/common/check.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/tdb/common/check.c') diff --git a/lib/tdb/common/check.c b/lib/tdb/common/check.c index fd3c0a91f3..b1b98d4f1e 100644 --- a/lib/tdb/common/check.c +++ b/lib/tdb/common/check.c @@ -28,6 +28,7 @@ static bool tdb_check_header(struct tdb_context *tdb, tdb_off_t *recovery) { struct tdb_header hdr; + uint32_t h1, h2; if (tdb->methods->tdb_read(tdb, 0, &hdr, sizeof(hdr), 0) == -1) return false; @@ -41,6 +42,11 @@ static bool tdb_check_header(struct tdb_context *tdb, tdb_off_t *recovery) if (hdr.rwlocks != 0) goto corrupt; + tdb_header_hash(tdb, &h1, &h2); + if (hdr.magic1_hash && hdr.magic2_hash && + (hdr.magic1_hash != h1 || hdr.magic2_hash != h2)) + goto corrupt; + if (hdr.hash_size == 0) goto corrupt; -- cgit