/*
out of bounds check during a transaction
*/
-static int transaction1_oob(struct tdb_context *tdb, tdb1_off_t len, int probe)
+static int transaction1_oob(struct tdb_context *tdb, tdb1_off_t off, tdb1_off_t len, int probe)
{
- if (len <= tdb->file->map_size) {
+ if (off + len >= off && off + len <= tdb->file->map_size) {
return 0;
}
tdb->last_error = TDB_ERR_IO;
static int _tdb1_transaction_start(struct tdb_context *tdb)
{
/* some sanity checks */
- if ((tdb->flags & TDB_RDONLY) || (tdb->flags & TDB_INTERNAL) || tdb->tdb1.traverse_read) {
- tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
- "tdb1_transaction_start: cannot start a"
- " transaction on a read-only or"
- " internal db");
+ if (tdb->flags & TDB_INTERNAL) {
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
+ TDB_LOG_USE_ERROR,
+ "tdb1_transaction_start:"
+ " cannot start a"
+ " transaction on an"
+ " internal tdb");
+ return -1;
+ }
+
+ if ((tdb->flags & TDB_RDONLY) || tdb->tdb1.traverse_read) {
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_RDONLY,
+ TDB_LOG_USE_ERROR,
+ "tdb_transaction_start:"
+ " cannot start a"
+ " transaction on a "
+ " read-only tdb");
return -1;
}
/* cope with nested tdb1_transaction_start() calls */
if (tdb->tdb1.transaction != NULL) {
if (!(tdb->flags & TDB_ALLOW_NESTING)) {
- tdb->last_error = TDB_ERR_EINVAL;
+ tdb->last_error
+ = tdb_logerr(tdb, TDB_ERR_EINVAL,
+ TDB_LOG_USE_ERROR,
+ "tdb_transaction_start:"
+ " already inside transaction");
return -1;
}
tdb->stats.transaction_nest++;
/* make sure we know about any file expansions already done by
anyone else */
- tdb->tdb1.io->tdb1_oob(tdb, tdb->file->map_size + 1, 1);
+ tdb->tdb1.io->tdb1_oob(tdb, tdb->file->map_size, 1, 1);
tdb->tdb1.transaction->old_map_size = tdb->file->map_size;
/* finally hook the io methods, replacing them with
*recovery_size = tdb1_recovery_size(tdb);
/* round up to a multiple of page size */
- *recovery_max_size = TDB1_ALIGN(sizeof(rec) + *recovery_size,
- tdb->tdb1.page_size) - sizeof(rec);
+ *recovery_max_size = tdb1_expand_adjust(tdb->file->map_size,
+ *recovery_size,
+ tdb->tdb1.page_size)
+ - sizeof(rec);
+
*recovery_offset = tdb->file->map_size;
recovery_head = *recovery_offset;
tdb->stats.transaction_expand_file++;
/* remap the file (if using mmap) */
- methods->tdb1_oob(tdb, tdb->file->map_size + 1, 1);
+ methods->tdb1_oob(tdb, tdb->file->map_size, 1, 1);
/* we have to reset the old map size so that we don't try to expand the file
again in the transaction commit, which would destroy the recovery area */
}
tdb->stats.transaction_expand_file++;
tdb->file->map_size = tdb->tdb1.transaction->old_map_size;
- methods->tdb1_oob(tdb, tdb->file->map_size + 1, 1);
+ methods->tdb1_oob(tdb, tdb->file->map_size, 1, 1);
}
/* Keep the open lock until the actual commit */
_tdb1_transaction_cancel(tdb);
if (need_repack) {
- return tdb_repack(tdb);
+ if (tdb_repack(tdb) != 0)
+ return -1;
}
return 0;
/* find the recovery area */
if (tdb1_ofs_read(tdb, TDB1_RECOVERY_HEAD, &recovery_head) == -1) {
- return tdb->last_error;
+ return TDB_ERR_TO_OFF(tdb->last_error);
}
if (recovery_head == 0) {
/* read the recovery record */
if (tdb->tdb1.io->tdb1_read(tdb, recovery_head, &rec,
sizeof(rec), TDB1_DOCONV()) == -1) {
- return tdb->last_error;
+ return TDB_ERR_TO_OFF(tdb->last_error);
}
return (rec.magic == TDB1_RECOVERY_MAGIC);