Skip to content

[3006.x] Fix msgpack leak in tcp.py #68399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 3006.x
Choose a base branch
from
Open

[3006.x] Fix msgpack leak in tcp.py #68399

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2275ba3
Fix msgpack leak in tcp.py
OrangeDog Oct 15, 2025
51068bc
!fixup 2275ba3d
OrangeDog Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions salt/transport/tcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@ def __init__(self, message_handler, *args, **kwargs):
self.io_loop = io_loop
self.clients = []
self.message_handler = message_handler
self.unpacker = salt.utils.msgpack.Unpacker()

@salt.ext.tornado.gen.coroutine
def handle_stream( # pylint: disable=arguments-differ
Expand All @@ -427,21 +428,22 @@ def handle_stream( # pylint: disable=arguments-differ
"""
log.trace("Req client %s connected", address)
self.clients.append((stream, address))
unpacker = salt.utils.msgpack.Unpacker()
try:
while True:
wire_bytes = yield stream.read_bytes(4096, partial=True)
unpacker.feed(wire_bytes)
for framed_msg in unpacker:
self.unpacker.feed(wire_bytes)
for framed_msg in self.unpacker:
framed_msg = salt.transport.frame.decode_embedded_strs(framed_msg)
header = framed_msg["head"]
self.io_loop.spawn_callback(
self.message_handler, stream, framed_msg["body"], header
)
except _StreamClosedError:
self.unpacker = salt.utils.msgpack.Unpacker()
log.trace("req client disconnected %s", address)
self.remove_client((stream, address))
except Exception as e: # pylint: disable=broad-except
self.unpacker = salt.utils.msgpack.Unpacker()
log.trace("other master-side exception: %s", e, exc_info=True)
self.remove_client((stream, address))
stream.close()
Expand Down
Loading