From c701b8e13148e66770cd91738c09ac35deb7586b Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sat, 5 Sep 2026 12:16:21 -0400 Subject: [PATCH] correct use-after-free crash for Replication, NetworkTree and KeysUpdate packets; --- src/fne/network/MetadataNetwork.cpp | 9 ++++++-- src/fne/network/MetadataNetwork.h | 4 +++- src/fne/network/packet/KeysUpdate.cpp | 29 ++++++++++++++------------ src/fne/network/packet/NetworkTree.cpp | 25 ++++++++++++---------- src/fne/network/packet/Replication.cpp | 25 ++++++++++++---------- 5 files changed, 54 insertions(+), 38 deletions(-) diff --git a/src/fne/network/MetadataNetwork.cpp b/src/fne/network/MetadataNetwork.cpp index 2ebac5c7..db374f78 100644 --- a/src/fne/network/MetadataNetwork.cpp +++ b/src/fne/network/MetadataNetwork.cpp @@ -200,10 +200,15 @@ MetadataNetwork::PacketBufferEntryPtr MetadataNetwork::findOrCreatePacketBufferE /* Erases a packet buffer entry from the map. */ -void MetadataNetwork::erasePacketBufferEntry(PacketBufferMap& pktMap, uint32_t peerId) +void MetadataNetwork::erasePacketBufferEntry(PacketBufferMap& pktMap, uint32_t peerId, const PacketBufferEntryPtr& pkt) { pktMap.lock(false); - pktMap.get().erase(peerId); + + auto& entries = pktMap.get(); + auto it = entries.find(peerId); + if (it != entries.end() && it->second == pkt) + entries.erase(it); + pktMap.unlock(); } diff --git a/src/fne/network/MetadataNetwork.h b/src/fne/network/MetadataNetwork.h index 5eed5ba1..3b289ffb 100644 --- a/src/fne/network/MetadataNetwork.h +++ b/src/fne/network/MetadataNetwork.h @@ -172,8 +172,10 @@ namespace network * @brief Erases a packet buffer entry from the map. * @param pktMap Instance of the PacketBufferMap class. * @param peerId Peer ID of the packet buffer entry. + * @param pkt Expected packet buffer entry. The map entry is only erased if + * it still refers to this instance. */ - static void erasePacketBufferEntry(PacketBufferMap& pktMap, uint32_t peerId); + static void erasePacketBufferEntry(PacketBufferMap& pktMap, uint32_t peerId, const PacketBufferEntryPtr& pkt); /* ** Packet Processing diff --git a/src/fne/network/packet/KeysUpdate.cpp b/src/fne/network/packet/KeysUpdate.cpp index 727da49f..9d4b0bc5 100644 --- a/src/fne/network/packet/KeysUpdate.cpp +++ b/src/fne/network/packet/KeysUpdate.cpp @@ -183,9 +183,8 @@ void MetadataNetwork::PacketHandler::keysUpdate(TrafficNetwork* network, Metadat bool created = false; PacketBufferEntryPtr pkt = findOrCreatePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId, "Remote EKC, Key Update", streamId, &created); - if (pkt == nullptr || !pkt->buffer) { + if (pkt == nullptr) { LogError(LOG_REPL, "PEER %u Remote EKC, Key Update, failed to initialize packet buffer", peerId); - erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId); return; } @@ -222,7 +221,7 @@ void MetadataNetwork::PacketHandler::keysUpdate(TrafficNetwork* network, Metadat // Utils::dump(1U, "MetadataNetwork::taskNetworkRx(), KEYS_UPDATE, Raw Payload", rawPayload, req->length); PacketBufferEntryPtr pkt = findPacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId); - if (pkt == nullptr || !pkt->buffer) { + if (pkt == nullptr) { return; } @@ -235,12 +234,16 @@ void MetadataNetwork::PacketHandler::keysUpdate(TrafficNetwork* network, Metadat if (!pktLock.owns_lock()) { LogError(LOG_STP, "PEER %u Remote EKC, Key Update, timeout waiting for packet buffer to unlock", peerId); - if (pkt->buffer) { - pkt->buffer->clear(); - pkt->buffer.reset(); - } - pkt->streamId = 0U; - erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId); + // detach the stalled transfer without destroying state that + // another worker still owns; its shared_ptr keeps it alive + erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId, pkt); + return; + } + + // the worker that previously owned the entry may have completed the + // transfer and released the lock after resetting the buffer + if (!pkt->buffer) { + erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId, pkt); return; } @@ -251,7 +254,7 @@ void MetadataNetwork::PacketHandler::keysUpdate(TrafficNetwork* network, Metadat pkt->buffer.reset(); } pkt->streamId = 0U; - erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId); + erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId, pkt); return; } @@ -274,7 +277,7 @@ void MetadataNetwork::PacketHandler::keysUpdate(TrafficNetwork* network, Metadat if (decompressed != nullptr) { delete[] decompressed; } - erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId); + erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId, pkt); return; } @@ -293,7 +296,7 @@ void MetadataNetwork::PacketHandler::keysUpdate(TrafficNetwork* network, Metadat if (decompressed != nullptr) { delete[] decompressed; } - erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId); + erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId, pkt); return; } @@ -306,7 +309,7 @@ void MetadataNetwork::PacketHandler::keysUpdate(TrafficNetwork* network, Metadat if (decompressed != nullptr) { delete[] decompressed; } - erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId); + erasePacketBufferEntry(mdNetwork->m_peerKeyUpdatePkt, peerId, pkt); } } } diff --git a/src/fne/network/packet/NetworkTree.cpp b/src/fne/network/packet/NetworkTree.cpp index d7b2c565..6175b852 100644 --- a/src/fne/network/packet/NetworkTree.cpp +++ b/src/fne/network/packet/NetworkTree.cpp @@ -42,10 +42,9 @@ void MetadataNetwork::PacketHandler::networkTree(TrafficNetwork* network, Metada // Utils::dump(1U, "MetadataNetwork::taskNetworkRx(), NET_TREE_LIST, Raw Payload", rawPayload, req->length); PacketBufferEntryPtr pkt = findOrCreatePacketBufferEntry(mdNetwork->m_peerTreeListPkt, peerId, "Network Tree, Tree List", streamId); - if (pkt == nullptr || !pkt->buffer) { + if (pkt == nullptr) { LogError(LOG_STP, "PEER %u (%s) Network Tree, Tree List, failed to initialize packet buffer", peerId, connection->identWithQualifier().c_str()); - erasePacketBufferEntry(mdNetwork->m_peerTreeListPkt, peerId); return; } @@ -59,12 +58,16 @@ void MetadataNetwork::PacketHandler::networkTree(TrafficNetwork* network, Metada if (!pktLock.owns_lock()) { LogError(LOG_STP, "PEER %u (%s) Network Tree, Tree List, timeout waiting for packet buffer to unlock", peerId, connection->identWithQualifier().c_str()); - if (pkt->buffer) { - pkt->buffer->clear(); - pkt->buffer.reset(); - } - pkt->streamId = 0U; - erasePacketBufferEntry(mdNetwork->m_peerTreeListPkt, peerId); + // detach the stalled transfer without destroying state that + // another worker still owns; its shared_ptr keeps it alive + erasePacketBufferEntry(mdNetwork->m_peerTreeListPkt, peerId, pkt); + return; + } + + // the worker that previously owned the entry may have completed the + // transfer and released the lock after resetting the buffer + if (!pkt->buffer) { + erasePacketBufferEntry(mdNetwork->m_peerTreeListPkt, peerId, pkt); return; } @@ -92,7 +95,7 @@ void MetadataNetwork::PacketHandler::networkTree(TrafficNetwork* network, Metada if (decompressed != nullptr) { delete[] decompressed; } - erasePacketBufferEntry(mdNetwork->m_peerTreeListPkt, peerId); + erasePacketBufferEntry(mdNetwork->m_peerTreeListPkt, peerId, pkt); return; } else { @@ -105,7 +108,7 @@ void MetadataNetwork::PacketHandler::networkTree(TrafficNetwork* network, Metada if (decompressed != nullptr) { delete[] decompressed; } - erasePacketBufferEntry(mdNetwork->m_peerTreeListPkt, peerId); + erasePacketBufferEntry(mdNetwork->m_peerTreeListPkt, peerId, pkt); return; } else { @@ -135,7 +138,7 @@ void MetadataNetwork::PacketHandler::networkTree(TrafficNetwork* network, Metada if (decompressed != nullptr) { delete[] decompressed; } - erasePacketBufferEntry(mdNetwork->m_peerTreeListPkt, peerId); + erasePacketBufferEntry(mdNetwork->m_peerTreeListPkt, peerId, pkt); } } else { diff --git a/src/fne/network/packet/Replication.cpp b/src/fne/network/packet/Replication.cpp index 8743fff5..33691d36 100644 --- a/src/fne/network/packet/Replication.cpp +++ b/src/fne/network/packet/Replication.cpp @@ -40,10 +40,9 @@ void MetadataNetwork::PacketHandler::replication(TrafficNetwork* network, Metada // Utils::dump(1U, "MetadataNetwork::taskNetworkRx(), REPL_ACT_PEER_LIST, Raw Payload", rawPayload, req->length); PacketBufferEntryPtr pkt = findOrCreatePacketBufferEntry(mdNetwork->m_peerReplicaActPkt, peerId, "Peer Replication, Active Peer List", streamId); - if (pkt == nullptr || !pkt->buffer) { + if (pkt == nullptr) { LogError(LOG_REPL, "PEER %u (%s) Peer Replication, Active Peer List, failed to initialize packet buffer", peerId, connection->identWithQualifier().c_str()); - erasePacketBufferEntry(mdNetwork->m_peerReplicaActPkt, peerId); return; } @@ -57,12 +56,16 @@ void MetadataNetwork::PacketHandler::replication(TrafficNetwork* network, Metada if (!pktLock.owns_lock()) { LogError(LOG_STP, "PEER %u (%s) Peer Replication, Active Peer List, timeout waiting for packet buffer to unlock", peerId, connection->identWithQualifier().c_str()); - if (pkt->buffer) { - pkt->buffer->clear(); - pkt->buffer.reset(); - } - pkt->streamId = 0U; - erasePacketBufferEntry(mdNetwork->m_peerReplicaActPkt, peerId); + // detach the stalled transfer without destroying state that + // another worker still owns; its shared_ptr keeps it alive + erasePacketBufferEntry(mdNetwork->m_peerReplicaActPkt, peerId, pkt); + return; + } + + // the worker that previously owned the entry may have completed the + // transfer and released the lock after resetting the buffer + if (!pkt->buffer) { + erasePacketBufferEntry(mdNetwork->m_peerReplicaActPkt, peerId, pkt); return; } @@ -90,7 +93,7 @@ void MetadataNetwork::PacketHandler::replication(TrafficNetwork* network, Metada if (decompressed != nullptr) { delete[] decompressed; } - erasePacketBufferEntry(mdNetwork->m_peerReplicaActPkt, peerId); + erasePacketBufferEntry(mdNetwork->m_peerReplicaActPkt, peerId, pkt); return; } else { @@ -103,7 +106,7 @@ void MetadataNetwork::PacketHandler::replication(TrafficNetwork* network, Metada if (decompressed != nullptr) { delete[] decompressed; } - erasePacketBufferEntry(mdNetwork->m_peerReplicaActPkt, peerId); + erasePacketBufferEntry(mdNetwork->m_peerReplicaActPkt, peerId, pkt); return; } else { @@ -119,7 +122,7 @@ void MetadataNetwork::PacketHandler::replication(TrafficNetwork* network, Metada if (decompressed != nullptr) { delete[] decompressed; } - erasePacketBufferEntry(mdNetwork->m_peerReplicaActPkt, peerId); + erasePacketBufferEntry(mdNetwork->m_peerReplicaActPkt, peerId, pkt); } } else {