aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMasahiko Sawada <msawada@postgresql.org>2023-07-26 14:41:23 +0900
committerMasahiko Sawada <msawada@postgresql.org>2023-07-26 14:41:23 +0900
commitb4f14d2e433bf9f2499f07bcaca07b9ff13d641b (patch)
tree5a0461885cde63926303622556ad768d2355aa43 /src
parent35c85c3c9b90eb70937c8f409d2e7615b2bdb538 (diff)
downloadpostgresql-b4f14d2e433bf9f2499f07bcaca07b9ff13d641b.tar.gz
postgresql-b4f14d2e433bf9f2499f07bcaca07b9ff13d641b.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
Diffstat (limited to 'src')
-rw-r--r--src/backend/storage/lmgr/lock.c2
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);