Changeset 740 for vendor/current/lib/tdb/common/check.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/lib/tdb/common/check.c (modified) (8 diffs)

vendor/current/lib/tdb/common/check.c ¶

@@ -29 +29 @@
 {
         struct tdb_header hdr;
-
-        if (tdb->methods->tdb_read(tdb, 0, &hdr, sizeof(hdr), DOCONV()) == -1)
+        uint32_t h1, h2;
+
+        if (tdb->methods->tdb_read(tdb, 0, &hdr, sizeof(hdr), 0) == -1)
                 return false;
         if (strcmp(hdr.magic_food, TDB_MAGIC_FOOD) != 0)
@@ -39 +40 @@
                 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;
 
@@ -302 +308 @@
 }
 
-int tdb_check(struct tdb_context *tdb,
+/* Slow, but should be very rare. */
+size_t tdb_dead_space(struct tdb_context *tdb, tdb_off_t off)
+{
+        size_t len;
+
+        for (len = 0; off + len < tdb->map_size; len++) {
+                char c;
+                if (tdb->methods->tdb_read(tdb, off, &c, 1, 0))
+                        return 0;
+                if (c != 0 && c != 0x42)
+                        break;
+        }
+        return len;
+}
+
+_PUBLIC_ int tdb_check(struct tdb_context *tdb,
               int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
               void *private_data)
@@ -311 +332 @@
         struct tdb_record rec;
         bool found_recovery = false;
-
-        if (tdb_lockall(tdb) == -1)
-                return -1;
+        tdb_len_t dead;
+        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. */
@@ -370 +400 @@
                                 goto free;
                         break;
+                /* If we crash after ftruncate, we can get zeroes or fill. */
+                case TDB_RECOVERY_INVALID_MAGIC:
+                case 0x42424242:
+                        if (recovery_start == off) {
+                                found_recovery = true;
+                                break;
+                        }
+                        dead = tdb_dead_space(tdb, off);
+                        if (dead < sizeof(rec))
+                                goto corrupt;
+
+                        TDB_LOG((tdb, TDB_DEBUG_ERROR,
+                                 "Dead space at %d-%d (of %u)\n",
+                                 off, off + dead, tdb->map_size));
+                        rec.rec_len = dead - sizeof(rec);
+                        break;
                 case TDB_RECOVERY_MAGIC:
-                case 0: /* Used for invalid (or in-progress) recovery area. */
                         if (recovery_start != off) {
                                 TDB_LOG((tdb, TDB_DEBUG_ERROR,
@@ -380 +425 @@
                         found_recovery = true;
                         break;
-                default:
+                default: ;
+                corrupt:
                         tdb->ecode = TDB_ERR_CORRUPT;
                         TDB_LOG((tdb, TDB_DEBUG_ERROR,
@@ -406 +452 @@
         if (recovery_start != 0 && !found_recovery) {
                 TDB_LOG((tdb, TDB_DEBUG_ERROR,
-                         "Expected %s recovery area, got %s\n",
-                         recovery_start ? "a" : "no",
-                         found_recovery ? "one" : "none"));
+                         "Expected a recovery area at %u\n",
+                         recovery_start));
                 goto free;
         }
 
         free(hashes);
-        tdb_unlockall(tdb);
+        if (locked) {
+                tdb_unlockall_read(tdb);
+        }
         return 0;
 
@@ -419 +466 @@
         free(hashes);
 unlock:
-        tdb_unlockall(tdb);
+        if (locked) {
+                tdb_unlockall_read(tdb);
+        }
         return -1;
 }