tdb2: fix traversal bug in free list lock_and_alloc()

[ccan] / ccan / tdb2 / transaction.c

diff --git a/ccan/tdb2/transaction.c b/ccan/tdb2/transaction.c
index 73ab1e39ff4ad0c4f260be0bf1dc6d9eca95bcd2..976ebd74f27e7ae3c10b98d8f8d930431f28233e 100644 (file)
--- a/ccan/tdb2/transaction.c
+++ b/ccan/tdb2/transaction.c
@@ -402,7 +402,7 @@ static void *transaction_direct(struct tdb_context *tdb, tdb_off_t off,
                return tdb->transaction->blocks[blk] + off % getpagesize();
 
        /* Otherwise must be all not copied. */
-       while (blk < end_blk) {
+       while (blk <= end_blk) {
                if (blk >= tdb->transaction->num_blocks)
                        break;
                if (tdb->transaction->blocks[blk])
@@ -519,32 +519,42 @@ enum TDB_ERROR tdb_transaction_start(struct tdb_context *tdb)
 
        /* some sanity checks */
        if (tdb->read_only || (tdb->flags & TDB_INTERNAL)) {
-               return tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
-                                 "tdb_transaction_start: cannot start a"
-                                 " transaction on a read-only or internal db");
+               return tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
+                                                   TDB_LOG_USE_ERROR,
+                                                   "tdb_transaction_start:"
+                                                   " cannot start a"
+                                                   " transaction on a "
+                                                   "read-only or internal db");
        }
 
        /* cope with nested tdb_transaction_start() calls */
        if (tdb->transaction != NULL) {
-               return tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_USE_ERROR,
-                                 "tdb_transaction_start:"
-                                 " already inside transaction");
+               return tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO,
+                                                   TDB_LOG_USE_ERROR,
+                                                   "tdb_transaction_start:"
+                                                   " already inside"
+                                                   " transaction");
        }
 
        if (tdb_has_hash_locks(tdb)) {
                /* the caller must not have any locks when starting a
                   transaction as otherwise we'll be screwed by lack
                   of nested locks in POSIX */
-               return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_USE_ERROR,
-                                 "tdb_transaction_start: cannot start a"
-                                 " transaction with locks held");
+               return tdb->last_error = tdb_logerr(tdb, TDB_ERR_LOCK,
+                                                   TDB_LOG_USE_ERROR,
+                                                   "tdb_transaction_start:"
+                                                   " cannot start a"
+                                                   " transaction with locks"
+                                                   " held");
        }
 
        tdb->transaction = (struct tdb_transaction *)
                calloc(sizeof(struct tdb_transaction), 1);
        if (tdb->transaction == NULL) {
-               return tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
-                                 "tdb_transaction_start: cannot allocate");
+               return tdb->last_error = tdb_logerr(tdb, TDB_ERR_OOM,
+                                                   TDB_LOG_ERROR,
+                                                   "tdb_transaction_start:"
+                                                   " cannot allocate");
        }
 
        /* get the transaction write lock. This is a blocking lock. As
@@ -554,7 +564,7 @@ enum TDB_ERROR tdb_transaction_start(struct tdb_context *tdb)
        if (ecode != TDB_SUCCESS) {
                SAFE_FREE(tdb->transaction->blocks);
                SAFE_FREE(tdb->transaction);
-               return ecode;
+               return tdb->last_error = ecode;
        }
 
        /* get a read lock over entire file. This is upgraded to a write
@@ -573,13 +583,13 @@ enum TDB_ERROR tdb_transaction_start(struct tdb_context *tdb)
           transaction specific methods */
        tdb->transaction->io_methods = tdb->methods;
        tdb->methods = &transaction_methods;
-       return TDB_SUCCESS;
+       return tdb->last_error = TDB_SUCCESS;
 
 fail_allrecord_lock:
        tdb_transaction_unlock(tdb, F_WRLCK);
        SAFE_FREE(tdb->transaction->blocks);
        SAFE_FREE(tdb->transaction);
-       return ecode;
+       return tdb->last_error = ecode;
 }
 
 
@@ -983,27 +993,29 @@ enum TDB_ERROR tdb_transaction_commit(struct tdb_context *tdb)
        enum TDB_ERROR ecode;
 
        if (tdb->transaction == NULL) {
-               return tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
-                                 "tdb_transaction_commit: no transaction");
+               return tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
+                                                   TDB_LOG_USE_ERROR,
+                                                   "tdb_transaction_commit:"
+                                                   " no transaction");
        }
 
        tdb_trace(tdb, "tdb_transaction_commit");
 
        if (tdb->transaction->nesting != 0) {
                tdb->transaction->nesting--;
-               return TDB_SUCCESS;
+               return tdb->last_error = TDB_SUCCESS;
        }
 
        /* check for a null transaction */
        if (tdb->transaction->blocks == NULL) {
                _tdb_transaction_cancel(tdb);
-               return TDB_SUCCESS;
+               return tdb->last_error = TDB_SUCCESS;
        }
 
        if (!tdb->transaction->prepared) {
                ecode = _tdb_transaction_prepare_commit(tdb);
                if (ecode != TDB_SUCCESS)
-                       return ecode;
+                       return tdb->last_error = ecode;
        }
 
        methods = tdb->transaction->io_methods;
@@ -1038,7 +1050,7 @@ enum TDB_ERROR tdb_transaction_commit(struct tdb_context *tdb)
 
                        _tdb_transaction_cancel(tdb);
 
-                       return ecode;
+                       return tdb->last_error = ecode;
                }
                SAFE_FREE(tdb->transaction->blocks[i]);
        }
@@ -1049,7 +1061,7 @@ enum TDB_ERROR tdb_transaction_commit(struct tdb_context *tdb)
        /* ensure the new data is on disk */
        ecode = transaction_sync(tdb, 0, tdb->file->map_size);
        if (ecode != TDB_SUCCESS) {
-               return ecode;
+               return tdb->last_error = ecode;
        }
 
        /*
@@ -1068,10 +1080,11 @@ enum TDB_ERROR tdb_transaction_commit(struct tdb_context *tdb)
 #endif
 
        /* use a transaction cancel to free memory and remove the
-          transaction locks */
+          transaction locks: it "restores" map_size, too. */
+       tdb->transaction->old_map_size = tdb->file->map_size;
        _tdb_transaction_cancel(tdb);
 
-       return TDB_SUCCESS;
+       return tdb->last_error = TDB_SUCCESS;
 }