summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/tdb2/check.c4
-rw-r--r--lib/tdb2/free.c2
-rw-r--r--lib/tdb2/io.c29
-rw-r--r--lib/tdb2/open.c2
-rw-r--r--lib/tdb2/private.h2
-rw-r--r--lib/tdb2/transaction.c10
6 files changed, 29 insertions, 20 deletions
diff --git a/lib/tdb2/check.c b/lib/tdb2/check.c
index 238a5b3a46..ecd6c13c53 100644
--- a/lib/tdb2/check.c
+++ b/lib/tdb2/check.c
@@ -497,8 +497,8 @@ static enum TDB_ERROR check_free(struct tdb_context *tdb,
}
- ecode = tdb->tdb2.io->oob(tdb, off
- + frec_len(frec)
+ ecode = tdb->tdb2.io->oob(tdb, off,
+ frec_len(frec)
+ sizeof(struct tdb_used_record),
false);
if (ecode != TDB_SUCCESS) {
diff --git a/lib/tdb2/free.c b/lib/tdb2/free.c
index bb819a2fd3..f8934d1d60 100644
--- a/lib/tdb2/free.c
+++ b/lib/tdb2/free.c
@@ -898,7 +898,7 @@ static enum TDB_ERROR tdb_expand(struct tdb_context *tdb, tdb_len_t size)
/* Someone else may have expanded the file, so retry. */
old_size = tdb->file->map_size;
- tdb->tdb2.io->oob(tdb, tdb->file->map_size + 1, true);
+ tdb->tdb2.io->oob(tdb, tdb->file->map_size, 1, true);
if (tdb->file->map_size != old_size) {
tdb_unlock_expand(tdb, F_WRLCK);
return TDB_SUCCESS;
diff --git a/lib/tdb2/io.c b/lib/tdb2/io.c
index afab0c1a4c..b4a6f0beae 100644
--- a/lib/tdb2/io.c
+++ b/lib/tdb2/io.c
@@ -81,8 +81,8 @@ void tdb_mmap(struct tdb_context *tdb)
If probe is true, len being too large isn't a failure.
*/
-static enum TDB_ERROR tdb_oob(struct tdb_context *tdb, tdb_off_t len,
- bool probe)
+static enum TDB_ERROR tdb_oob(struct tdb_context *tdb,
+ tdb_off_t off, tdb_len_t len, bool probe)
{
struct stat st;
enum TDB_ERROR ecode;
@@ -92,7 +92,16 @@ static enum TDB_ERROR tdb_oob(struct tdb_context *tdb, tdb_off_t len,
|| (tdb->flags & TDB_NOLOCK)
|| tdb_has_expansion_lock(tdb));
- if (len <= tdb->file->map_size)
+ if (len + off < len) {
+ if (probe)
+ return TDB_SUCCESS;
+
+ return tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb_oob off %llu len %llu wrap\n",
+ (long long)off, (long long)len);
+ }
+
+ if (len + off <= tdb->file->map_size)
return TDB_SUCCESS;
if (tdb->flags & TDB_INTERNAL) {
if (probe)
@@ -101,7 +110,7 @@ static enum TDB_ERROR tdb_oob(struct tdb_context *tdb, tdb_off_t len,
tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"tdb_oob len %lld beyond internal"
" malloc size %lld",
- (long long)len,
+ (long long)(off + len),
(long long)tdb->file->map_size);
return TDB_ERR_IO;
}
@@ -120,13 +129,13 @@ static enum TDB_ERROR tdb_oob(struct tdb_context *tdb, tdb_off_t len,
tdb_unlock_expand(tdb, F_RDLCK);
- if (st.st_size < (size_t)len) {
+ if (st.st_size < off + len) {
if (probe)
return TDB_SUCCESS;
tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
- "tdb_oob len %zu beyond eof at %zu",
- (size_t)len, st.st_size);
+ "tdb_oob len %llu beyond eof at %zu",
+ (long long)(off + len), st.st_size);
return TDB_ERR_IO;
}
@@ -253,7 +262,7 @@ static enum TDB_ERROR tdb_write(struct tdb_context *tdb, tdb_off_t off,
"Write to read-only database");
}
- ecode = tdb->tdb2.io->oob(tdb, off + len, false);
+ ecode = tdb->tdb2.io->oob(tdb, off, len, false);
if (ecode != TDB_SUCCESS) {
return ecode;
}
@@ -283,7 +292,7 @@ static enum TDB_ERROR tdb_read(struct tdb_context *tdb, tdb_off_t off,
{
enum TDB_ERROR ecode;
- ecode = tdb->tdb2.io->oob(tdb, off + len, false);
+ ecode = tdb->tdb2.io->oob(tdb, off, len, false);
if (ecode != TDB_SUCCESS) {
return ecode;
}
@@ -574,7 +583,7 @@ static void *tdb_direct(struct tdb_context *tdb, tdb_off_t off, size_t len,
if (unlikely(!tdb->file->map_ptr))
return NULL;
- ecode = tdb_oob(tdb, off + len, false);
+ ecode = tdb_oob(tdb, off, len, false);
if (unlikely(ecode != TDB_SUCCESS))
return TDB_ERR_PTR(ecode);
return (char *)tdb->file->map_ptr + off;
diff --git a/lib/tdb2/open.c b/lib/tdb2/open.c
index 4965d86288..2730f218d2 100644
--- a/lib/tdb2/open.c
+++ b/lib/tdb2/open.c
@@ -747,7 +747,7 @@ finished:
if (tdb->flags & TDB_VERSION1) {
ecode = tdb1_probe_length(tdb);
} else {
- ecode = tdb->tdb2.io->oob(tdb, tdb->file->map_size + 1, true);
+ ecode = tdb->tdb2.io->oob(tdb, tdb->file->map_size, 1, true);
}
if (unlikely(ecode != TDB_SUCCESS))
goto fail;
diff --git a/lib/tdb2/private.h b/lib/tdb2/private.h
index 85cd15a817..9b044610ae 100644
--- a/lib/tdb2/private.h
+++ b/lib/tdb2/private.h
@@ -359,7 +359,7 @@ struct tdb_methods {
tdb_len_t);
enum TDB_ERROR (*twrite)(struct tdb_context *, tdb_off_t, const void *,
tdb_len_t);
- enum TDB_ERROR (*oob)(struct tdb_context *, tdb_off_t, bool);
+ enum TDB_ERROR (*oob)(struct tdb_context *, tdb_off_t, tdb_len_t, bool);
enum TDB_ERROR (*expand_file)(struct tdb_context *, tdb_len_t);
void *(*direct)(struct tdb_context *, tdb_off_t, size_t, bool);
};
diff --git a/lib/tdb2/transaction.c b/lib/tdb2/transaction.c
index 1af1c4acaf..70e664fc2d 100644
--- a/lib/tdb2/transaction.c
+++ b/lib/tdb2/transaction.c
@@ -345,16 +345,16 @@ static void transaction_write_existing(struct tdb_context *tdb, tdb_off_t off,
/*
out of bounds check during a transaction
*/
-static enum TDB_ERROR transaction_oob(struct tdb_context *tdb, tdb_off_t len,
- bool probe)
+static enum TDB_ERROR transaction_oob(struct tdb_context *tdb,
+ tdb_off_t off, tdb_len_t len, bool probe)
{
- if (len <= tdb->file->map_size || probe) {
+ if ((off + len >= off && off + len <= tdb->file->map_size) || probe) {
return TDB_SUCCESS;
}
tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"tdb_oob len %lld beyond transaction size %lld",
- (long long)len,
+ (long long)(off + len),
(long long)tdb->file->map_size);
return TDB_ERR_IO;
}
@@ -601,7 +601,7 @@ enum TDB_ERROR tdb_transaction_start(struct tdb_context *tdb)
/* make sure we know about any file expansions already done by
anyone else */
- tdb->tdb2.io->oob(tdb, tdb->file->map_size + 1, true);
+ tdb->tdb2.io->oob(tdb, tdb->file->map_size, 1, true);
tdb->tdb2.transaction->old_map_size = tdb->file->map_size;
/* finally hook the io methods, replacing them with
generated by cgit (git 2.34.1) at 2024-11-26 11:22:18 +0000