]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Avoid stale slot access after dropping obsolete synced slots.
authorAmit Kapila <akapila@postgresql.org>
Thu, 18 Jun 2026 04:12:56 +0000 (09:42 +0530)
committerAmit Kapila <akapila@postgresql.org>
Thu, 18 Jun 2026 04:12:56 +0000 (09:42 +0530)
drop_local_obsolete_slots() continued to dereference local_slot after
calling ReplicationSlotDropAcquired().  Once the slot is dropped, its
entry in the slot array can be reused by another backend, so later reads
of local_slot->data could observe a different slot's name or database
OID, leading to an incorrect unlock and log message.

Save the slot name and database OID before performing the drop, and use
the saved values for the subsequent UnlockSharedObject() call and the log
message.  While at it, emit the "dropped replication slot" message only
when a slot was actually dropped, rather than unconditionally.

Author: Xuneng Zhou <xunengzhou@gmail.com>
Reviewed-by: Zhijie Hou <houzj.fnst@fujitsu.com>
Reviewed-by: Amit Kapila <amit.kapila16@gmail.com>
Reviewed-by: Fujii Masao <masao.fujii@gmail.com>
Backpatch-through: 17, where it was introduced
Discussion: https://postgr.es/m/TY4PR01MB177184FF9EE916F577E1F554194082@TY4PR01MB17718.jpnprd01.prod.outlook.com

src/backend/replication/logical/slotsync.c

index bc42d74fec24e8a782960f9d9f597f27991bc2c7..c4dda8aa5f1c7e4f0caa4a80fbdc407f985bb003 100644 (file)
@@ -463,6 +463,7 @@ drop_local_obsolete_slots(List *remote_slot_list)
                /* Drop the local slot if it is not required to be retained. */
                if (!local_sync_slot_required(local_slot, remote_slot_list))
                {
+                       Oid                     slot_database = local_slot->data.database;
                        bool            synced_slot;
 
                        /*
@@ -470,8 +471,8 @@ drop_local_obsolete_slots(List *remote_slot_list)
                         * ReplicationSlotsDropDBSlots(), trying to drop the same slot
                         * during a drop-database operation.
                         */
-                       LockSharedObject(DatabaseRelationId, local_slot->data.database,
-                                                        0, AccessShareLock);
+                       LockSharedObject(DatabaseRelationId, slot_database, 0,
+                                                        AccessShareLock);
 
                        /*
                         * In the small window between getting the slot to drop and
@@ -488,17 +489,19 @@ drop_local_obsolete_slots(List *remote_slot_list)
 
                        if (synced_slot)
                        {
-                               ReplicationSlotAcquire(NameStr(local_slot->data.name), true, false);
+                               NameData        slot_name = local_slot->data.name;
+
+                               ReplicationSlotAcquire(NameStr(slot_name), true, false);
                                ReplicationSlotDropAcquired();
-                       }
 
-                       UnlockSharedObject(DatabaseRelationId, local_slot->data.database,
-                                                          0, AccessShareLock);
+                               ereport(LOG,
+                                               errmsg("dropped replication slot \"%s\" of database with OID %u",
+                                                          NameStr(slot_name),
+                                                          slot_database));
+                       }
 
-                       ereport(LOG,
-                                       errmsg("dropped replication slot \"%s\" of database with OID %u",
-                                                  NameStr(local_slot->data.name),
-                                                  local_slot->data.database));
+                       UnlockSharedObject(DatabaseRelationId, slot_database, 0,
+                                                          AccessShareLock);
                }
        }
 }