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;
|| (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)
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;
}
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;
}
val = tdb_access_read(tdb, base + start * sizeof(tdb_off_t),
(end - start) * sizeof(tdb_off_t), false);
if (TDB_PTR_IS_ERR(val)) {
- return TDB_PTR_ERR(val);
+ return TDB_ERR_TO_OFF(TDB_PTR_ERR(val));
}
for (i = 0; i < (end - start); i++) {
/* Zero vs non-zero is the same unconverted: minor optimization. */
val = tdb_access_read(tdb, off, num * sizeof(tdb_off_t), false);
if (TDB_PTR_IS_ERR(val)) {
- return TDB_PTR_ERR(val);
+ return TDB_ERR_TO_OFF(TDB_PTR_ERR(val));
}
for (i = 0; i < num; i++) {
tdb_off_t *p = tdb->tdb2.io->direct(tdb, off, sizeof(*p),
false);
if (TDB_PTR_IS_ERR(p)) {
- return TDB_PTR_ERR(p);
+ return TDB_ERR_TO_OFF(TDB_PTR_ERR(p));
}
if (p)
return *p;
ecode = tdb_read_convert(tdb, off, &ret, sizeof(ret));
if (ecode != TDB_SUCCESS) {
- return ecode;
+ return TDB_ERR_TO_OFF(ecode);
}
return ret;
}
"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;
}
{
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;
}
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;
{
tdb_off_t seq;
+ if (tdb->flags & TDB_VERSION1) {
+ tdb1_increment_seqnum_nonblock(tdb);
+ return;
+ }
+
if (likely(!(tdb->flags & TDB_CONVERT))) {
int64_t *direct;