Issue 6494 - Various errors when using extended matching rule on vlv sort filter#6495
Merged
progier389 merged 2 commits into389ds:mainfrom Jan 13, 2025
Merged
Issue 6494 - Various errors when using extended matching rule on vlv sort filter#6495progier389 merged 2 commits into389ds:mainfrom
progier389 merged 2 commits into389ds:mainfrom
Conversation
progier389
commented
Jan 10, 2025
| /* | ||
| * Determine if vlv require extended matching rule evaluation | ||
| */ | ||
| static int |
Contributor
Author
There was a problem hiding this comment.
shoul use C11 bool
| dblayer_destroy_txn_stack(void) | ||
| { | ||
| /* Cleanup for the main thread to avoid false/positive leaks from libasan */ | ||
| void *txn_stack = PR_GetThreadPrivate(thread_private_txn_stack); |
Contributor
There was a problem hiding this comment.
Unused variable, but why "get" it if you just "set" it to NULL on the next line?
Contributor
Author
There was a problem hiding this comment.
Indeed, something looks broken.
either the slapi_ch_free(&txn_stack); line is missing, or the PR_GetThreadPrivate should be deleted. (depending whether PR_SetThreadPrivate calls the cleanup callback or not) I will double check
|
Contributor
Author
There was a problem hiding this comment.
Clearly the dblayer_cleanup_txn_stack is called when using PR_SetThreadPrivate ==> No need to get the data to release it
#1 0x7f00d94601eb in slapi_ch_free /home/progier/sb/r67020/tst/source/389-ds-base/ldap/servers/slapd/ch_malloc.c:286
#2 0x7f00d22a6876 in dblayer_cleanup_txn_stack /home/progier/sb/r67020/tst/source/389-ds-base/ldap/servers/slapd/back-ldbm/dblayer.c:1373
#3 0x7f00d8b04920 in PR_SetThreadPrivate (/lib64/libnspr4.so+0x13920) (BuildId: e6dfe24882ade9ec65f7f1591a3e9e249e5a5780)
#4 0x7f00d22aac9f in dblayer_destroy_txn_stack /home/progier/sb/r67020/tst/source/389-ds-base/ldap/servers/slapd/back-ldbm/dblayer.c:1429
#5 0x7f00d22aad5d in dblayer_close /home/progier/sb/r67020/tst/source/389-ds-base/ldap/servers/slapd/back-ldbm/dblayer.c:500
mreynolds389
approved these changes
Jan 10, 2025
Contributor
mreynolds389
left a comment
mreynolds389
left a comment
There was a problem hiding this comment.
Did a covscan run as well, and didn't see any regressions. Ack!
Contributor
|
Thanks for fixing those issues - re-ack! |
progier389
added a commit
that referenced
this pull request
Jan 13, 2025
…sort filter (#6495) * Issue 6494 - Various errors when using extended matching rule on vlv sort filter Various issues when configuring and using extended matching rule within a vlv sort filter: Race condition about the keys storage while indexing leading to various heap and data corruption. (lmdb only) Crash while indexing if vlv are misconfigured because NULL key is not checked. Read after block because of data type mismatch between SlapiValue and berval Memory leaks Solution: Serialize the vlv index key generation if vlv filter has an extended matching rule. Check null keys Always provides SlapiValue even ifg we want to get keys as bervals Free properly the resources Issue: #6494 Reviewed by: @mreynolds389 (Thanks!) (cherry picked from commit 4bd27ec)
progier389
added a commit
that referenced
this pull request
Jan 13, 2025
…sort filter (#6495) * Issue 6494 - Various errors when using extended matching rule on vlv sort filter Various issues when configuring and using extended matching rule within a vlv sort filter: Race condition about the keys storage while indexing leading to various heap and data corruption. (lmdb only) Crash while indexing if vlv are misconfigured because NULL key is not checked. Read after block because of data type mismatch between SlapiValue and berval Memory leaks Solution: Serialize the vlv index key generation if vlv filter has an extended matching rule. Check null keys Always provides SlapiValue even ifg we want to get keys as bervals Free properly the resources Issue: #6494 Reviewed by: @mreynolds389 (Thanks!) (cherry picked from commit 4bd27ec)
progier389
added a commit
that referenced
this pull request
Jan 13, 2025
…sort filter (#6495) * Issue 6494 - Various errors when using extended matching rule on vlv sort filter Various issues when configuring and using extended matching rule within a vlv sort filter: Race condition about the keys storage while indexing leading to various heap and data corruption. (lmdb only) Crash while indexing if vlv are misconfigured because NULL key is not checked. Read after block because of data type mismatch between SlapiValue and berval Memory leaks Solution: Serialize the vlv index key generation if vlv filter has an extended matching rule. Check null keys Always provides SlapiValue even ifg we want to get keys as bervals Free properly the resources Issue: #6494 Reviewed by: @mreynolds389 (Thanks!) (cherry picked from commit 4bd27ec)
progier389
added a commit
that referenced
this pull request
Jan 13, 2025
…sort filter (#6495) * Issue 6494 - Various errors when using extended matching rule on vlv sort filter Various issues when configuring and using extended matching rule within a vlv sort filter: Race condition about the keys storage while indexing leading to various heap and data corruption. (lmdb only) Crash while indexing if vlv are misconfigured because NULL key is not checked. Read after block because of data type mismatch between SlapiValue and berval Memory leaks Solution: Serialize the vlv index key generation if vlv filter has an extended matching rule. Check null keys Always provides SlapiValue even ifg we want to get keys as bervals Free properly the resources Issue: #6494 Reviewed by: @mreynolds389 (Thanks!) (cherry picked from commit 4bd27ec)
progier389
added a commit
that referenced
this pull request
Jan 13, 2025
…sort filter (#6495) * Issue 6494 - Various errors when using extended matching rule on vlv sort filter Various issues when configuring and using extended matching rule within a vlv sort filter: Race condition about the keys storage while indexing leading to various heap and data corruption. (lmdb only) Crash while indexing if vlv are misconfigured because NULL key is not checked. Read after block because of data type mismatch between SlapiValue and berval Memory leaks Solution: Serialize the vlv index key generation if vlv filter has an extended matching rule. Check null keys Always provides SlapiValue even ifg we want to get keys as bervals Free properly the resources Issue: #6494 Reviewed by: @mreynolds389 (Thanks!) (cherry picked from commit 4bd27ec) (cherry picked from commit 223a202)
progier389
added a commit
that referenced
this pull request
Jan 13, 2025
…sort filter (#6495) * Issue 6494 - Various errors when using extended matching rule on vlv sort filter Various issues when configuring and using extended matching rule within a vlv sort filter: Race condition about the keys storage while indexing leading to various heap and data corruption. (lmdb only) Crash while indexing if vlv are misconfigured because NULL key is not checked. Read after block because of data type mismatch between SlapiValue and berval Memory leaks Solution: Serialize the vlv index key generation if vlv filter has an extended matching rule. Check null keys Always provides SlapiValue even ifg we want to get keys as bervals Free properly the resources Issue: #6494 Reviewed by: @mreynolds389 (Thanks!) (cherry picked from commit 4bd27ec) (cherry picked from commit 223a202) (cherry picked from commit 2800437)
progier389
added a commit
that referenced
this pull request
Jan 13, 2025
…sort filter (#6495) * Issue 6494 - Various errors when using extended matching rule on vlv sort filter Various issues when configuring and using extended matching rule within a vlv sort filter: Race condition about the keys storage while indexing leading to various heap and data corruption. (lmdb only) Crash while indexing if vlv are misconfigured because NULL key is not checked. Read after block because of data type mismatch between SlapiValue and berval Memory leaks Solution: Serialize the vlv index key generation if vlv filter has an extended matching rule. Check null keys Always provides SlapiValue even ifg we want to get keys as bervals Free properly the resources Issue: #6494 Reviewed by: @mreynolds389 (Thanks!) (cherry picked from commit 4bd27ec) (cherry picked from commit 223a202) (cherry picked from commit 2800437)
progier389
added a commit
that referenced
this pull request
Jan 13, 2025
…sort filter (#6495) * Issue 6494 - Various errors when using extended matching rule on vlv sort filter Various issues when configuring and using extended matching rule within a vlv sort filter: Race condition about the keys storage while indexing leading to various heap and data corruption. (lmdb only) Crash while indexing if vlv are misconfigured because NULL key is not checked. Read after block because of data type mismatch between SlapiValue and berval Memory leaks Solution: Serialize the vlv index key generation if vlv filter has an extended matching rule. Check null keys Always provides SlapiValue even ifg we want to get keys as bervals Free properly the resources Issue: #6494 Reviewed by: @mreynolds389 (Thanks!) (cherry picked from commit 4bd27ec) (cherry picked from commit 223a202) (cherry picked from commit 2800437)
progier389
added a commit
that referenced
this pull request
Jan 13, 2025
…sort filter (#6495) * Issue 6494 - Various errors when using extended matching rule on vlv sort filter Various issues when configuring and using extended matching rule within a vlv sort filter: Race condition about the keys storage while indexing leading to various heap and data corruption. (lmdb only) Crash while indexing if vlv are misconfigured because NULL key is not checked. Read after block because of data type mismatch between SlapiValue and berval Memory leaks Solution: Serialize the vlv index key generation if vlv filter has an extended matching rule. Check null keys Always provides SlapiValue even ifg we want to get keys as bervals Free properly the resources Issue: #6494 Reviewed by: @mreynolds389 (Thanks!) (cherry picked from commit 4bd27ec) (cherry picked from commit 223a202) (cherry picked from commit 2800437)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Various issues when configuring and using extended matching rule within a vlv sort filter:
Solution:
Issue: #6494
Reviewed by: @mreynolds389 (Thanks!)