diff options
| author | Masahiko Sawada <msawada@postgresql.org> | 2023-07-26 14:41:26 +0900 |
|---|---|---|
| committer | Masahiko Sawada <msawada@postgresql.org> | 2023-07-26 14:41:26 +0900 |
| commit | bd88404d3cda53810e0b0144713c4b1a1dd965a8 (patch) | |
| tree | 2eee2aa3a59c73fb2ec426dd9a0a4bdfa0209602 | |
| parent | d9eb92c7b122c4cf40e95ec45e88b27b318a2be9 (diff) | |
| download | postgresql-bd88404d3cda53810e0b0144713c4b1a1dd965a8.tar.gz postgresql-bd88404d3cda53810e0b0144713c4b1a1dd965a8.zip | |
Fix crash with RemoveFromWaitQueue() when detecting a deadlock.
Commit 5764f611e used dclist_delete_from() to remove the proc from the
wait queue. However, since it doesn't clear dist_node's next/prev to
NULL, it could call RemoveFromWaitQueue() twice: when the process
detects a deadlock and then when cleaning up locks on aborting the
transaction. The waiting lock information is cleared in the first
call, so it led to a crash in the second call.
Backpatch to v16, where the change was introduced.
Bug: #18031
Reported-by: Justin Pryzby, Alexander Lakhin
Reviewed-by: Andres Freund
Discussion: https://postgr.es/m/ZKy4AdrLEfbqrxGJ%40telsasoft.com
Discussion: https://postgr.es/m/18031-ebe2d08cb405f6cc@postgresql.org
Backpatch-through: 16
| -rw-r--r-- | src/backend/storage/lmgr/lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index f595bce31b9..ec6240fbaee 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -1881,7 +1881,7 @@ RemoveFromWaitQueue(PGPROC *proc, uint32 hashcode) Assert(0 < lockmethodid && lockmethodid < lengthof(LockMethods)); /* Remove proc from lock's wait queue */ - dclist_delete_from(&waitLock->waitProcs, &proc->links); + dclist_delete_from_thoroughly(&waitLock->waitProcs, &proc->links); /* Undo increments of request counts by waiting process */ Assert(waitLock->nRequested > 0); |