upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-06-11 09:40:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#10521 LMDB: fix mdb_txn_begin

Browse source 
Don't allow read txns to have child txns. Broken by ITS#10395.
Simplify the conditional tests to make it obvious.
This commit is contained in:
Howard Chu 2026-06-10 20:32:41 +01:00
parent e27f3d616b
commit 962f072a62
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/liblmdb/mdb.c
View file

@ -3496,16 +3496,17 @@ mdb_txn_begin(MDB_env *env, MDB_txn *parent, unsigned int flags, MDB_txn **ret)
* if the nested txn is a write txn there may only be 1, no writemap;
* if the nested txn is a read txn there may be arbitrarily many.
*/
if (parent->mt_flags & MDB_TXN_RDONLY)
return EINVAL;
if (parent->mt_flags & MDB_TXN_BLOCKED)
return MDB_BAD_TXN;
if ((parent->mt_flags & MDB_TXN_WRITEMAP) && !(flags & MDB_RDONLY))
return EINVAL;
pthread_mutex_lock(&parent->mt_child_mutex);
flags |= parent->mt_flags;
if (parent->mt_child && F_ISSET(parent->mt_child->mt_flags, MDB_RDONLY) && F_ISSET(flags, MDB_RDONLY)) {
flags &= ~MDB_TXN_HAS_CHILD;
}
if ((F_ISSET(flags, MDB_WRITEMAP) && !F_ISSET(flags, MDB_RDONLY)) || F_ISSET(flags, MDB_TXN_BLOCKED)) {
flags = parent->mt_flags;
pthread_mutex_unlock(&parent->mt_child_mutex);
return (flags & MDB_TXN_RDONLY) ? EINVAL : MDB_BAD_TXN;
}
pthread_mutex_unlock(&parent->mt_child_mutex);
/* Child txns save MDB_pgstate and use own copy of cursors */
size = env->me_maxdbs * (sizeof(MDB_db)+sizeof(MDB_cursor *)+1);