s3: piddir creation fix part 2.

[ira/wip.git] / lib / tdb / common / check.c

diff --git a/lib/tdb/common/check.c b/lib/tdb/common/check.c
index 3be8a0c48b3b130b5687b718b534c8056113cb19..313f55cbb05ed39632ddc99ff60a189f266be9ec 100644 (file)
--- a/lib/tdb/common/check.c
+++ b/lib/tdb/common/check.c
@@ -28,8 +28,9 @@
 static bool tdb_check_header(struct tdb_context *tdb, tdb_off_t *recovery)
 {
        struct tdb_header hdr;
 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), DOCONV()) == -1)
+       if (tdb->methods->tdb_read(tdb, 0, &hdr, sizeof(hdr), 0) == -1)

                return false;
        if (strcmp(hdr.magic_food, TDB_MAGIC_FOOD) != 0)
                goto corrupt;
                return false;
        if (strcmp(hdr.magic_food, TDB_MAGIC_FOOD) != 0)
                goto corrupt;


@@ -38,7 +39,12 @@ static bool tdb_check_header(struct tdb_context *tdb, tdb_off_t *recovery)
        if (hdr.version != TDB_VERSION)
                goto corrupt;
 
        if (hdr.version != TDB_VERSION)
                goto corrupt;
 

-       if (hdr.rwlocks != 0)
+       if (hdr.rwlocks != 0 && hdr.rwlocks != TDB_HASH_RWLOCK_MAGIC)
+               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;
 
        if (hdr.hash_size == 0)


@@ -86,7 +92,7 @@ static bool tdb_check_record(struct tdb_context *tdb,
                         off, rec->next));
                goto corrupt;
        }
                         off, rec->next));
                goto corrupt;
        }

-       if (tdb->methods->tdb_oob(tdb, rec->next+sizeof(*rec), 0))
+       if (tdb->methods->tdb_oob(tdb, rec->next, sizeof(*rec), 0))

                goto corrupt;
 
        /* Check rec_len: similar to rec->next, implies next record. */
                goto corrupt;
 
        /* Check rec_len: similar to rec->next, implies next record. */


@@ -104,7 +110,7 @@ static bool tdb_check_record(struct tdb_context *tdb,
                goto corrupt;
        }
        /* OOB allows "right at the end" access, so this works for last rec. */
                goto corrupt;
        }
        /* OOB allows "right at the end" access, so this works for last rec. */

-       if (tdb->methods->tdb_oob(tdb, off+sizeof(*rec)+rec->rec_len, 0))
+       if (tdb->methods->tdb_oob(tdb, off, sizeof(*rec)+rec->rec_len, 0))

                goto corrupt;
 
        /* Check tailer. */
                goto corrupt;
 
        /* Check tailer. */


@@ -302,7 +308,7 @@ static bool tdb_check_free_record(struct tdb_context *tdb,
 }
 
 /* Slow, but should be very rare. */
 }
 
 /* Slow, but should be very rare. */

-static size_t dead_space(struct tdb_context *tdb, tdb_off_t off)
+size_t tdb_dead_space(struct tdb_context *tdb, tdb_off_t off)

 {
        size_t len;
 
 {
        size_t len;
 


@@ -316,7 +322,7 @@ static size_t dead_space(struct tdb_context *tdb, tdb_off_t off)
        return len;
 }
 
        return len;
 }
 

-int tdb_check(struct tdb_context *tdb,
+_PUBLIC_ int tdb_check(struct tdb_context *tdb,

              int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
              void *private_data)
 {
              int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
              void *private_data)
 {


@@ -326,12 +332,20 @@ int tdb_check(struct tdb_context *tdb,
        struct tdb_record rec;
        bool found_recovery = false;
        tdb_len_t dead;
        struct tdb_record rec;
        bool found_recovery = false;
        tdb_len_t dead;

-
-       if (tdb_lockall_read(tdb) == -1)
-               return -1;
+       bool locked;
+
+       /* Read-only databases use no locking at all: it's best-effort.
+        * We may have a write lock already, so skip that case too. */
+       if (tdb->read_only || tdb->allrecord_lock.count != 0) {
+               locked = false;
+       } else {
+               if (tdb_lockall_read(tdb) == -1)
+                       return -1;
+               locked = true;
+       }

 
        /* Make sure we know true size of the underlying file. */
 
        /* Make sure we know true size of the underlying file. */

-       tdb->methods->tdb_oob(tdb, tdb->map_size + 1, 1);
+       tdb->methods->tdb_oob(tdb, tdb->map_size, 1, 1);

 
        /* Header must be OK: also gets us the recovery ptr, if any. */
        if (!tdb_check_header(tdb, &recovery_start))
 
        /* Header must be OK: also gets us the recovery ptr, if any. */
        if (!tdb_check_header(tdb, &recovery_start))


@@ -392,7 +406,7 @@ int tdb_check(struct tdb_context *tdb,
                                found_recovery = true;
                                break;
                        }
                                found_recovery = true;
                                break;
                        }

-                       dead = dead_space(tdb, off);
+                       dead = tdb_dead_space(tdb, off);

                        if (dead < sizeof(rec))
                                goto corrupt;
 
                        if (dead < sizeof(rec))
                                goto corrupt;
 


@@ -443,12 +457,16 @@ int tdb_check(struct tdb_context *tdb,
        }
 
        free(hashes);
        }
 
        free(hashes);

-       tdb_unlockall_read(tdb);
+       if (locked) {
+               tdb_unlockall_read(tdb);
+       }

        return 0;
 
 free:
        free(hashes);
 unlock:
        return 0;
 
 free:
        free(hashes);
 unlock:

-       tdb_unlockall_read(tdb);
+       if (locked) {
+               tdb_unlockall_read(tdb);
+       }

        return -1;
 }
        return -1;
 }