diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2010-09-13 20:05:59 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-09-13 20:05:59 +0930 |
| commit | 786b7263000dedcb97e7369402e2e9dc967e36c4 (patch) | |
| tree | 11ac4c09070beae44e6c8e7c68f7ef27e2c20864 /lib/tdb/common/check.c | |
| parent | f77708e96268d18abbfb038f4e78fe9e11a2856f (diff) | |
| download | samba-786b7263000dedcb97e7369402e2e9dc967e36c4.tar.gz samba-786b7263000dedcb97e7369402e2e9dc967e36c4.tar.bz2 samba-786b7263000dedcb97e7369402e2e9dc967e36c4.zip | |
tdb: put example hashes into header, so we notice incorrect hash_fn.
This is Stefan Metzmacher <metze@samba.org>'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 <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb/common/check.c')
| -rw-r--r-- | lib/tdb/common/check.c | 6 |
1 files changed, 6 insertions, 0 deletions
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; |