Fix panic in DecodeMessageWithFDs on read error - #437
Merged
Merged
Conversation
The decoder reports read errors by panicking, and those panics are only recovered inside (*decoder).Decode. DecodeMessageWithFDs calls dec.align(8) directly to skip the padding before the message body, so if the underlying reader fails at that point (e.g. the connection is closed concurrently), the panic is not recovered and crashes the program. This was observed in CI as a TestTcpNonceConnection failure: panic: read tcp [::1]:44936->[::1]:41623: use of closed network connection ... github.com/godbus/dbus/v5.(*decoder).align(...) decoder.go:50 github.com/godbus/dbus/v5.DecodeMessageWithFDs(...) message.go:182 Skip the padding explicitly and return the read error instead. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
guelfey
force-pushed
the
fix-align-panic
branch
from
September 24, 2026 12:31
48b66ec to
0ea052a
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The decoder reports read errors by panicking, and those panics are only recovered inside
(*decoder).Decode.DecodeMessageWithFDscallsdec.align(8)directly to skip the padding before the message body, so if the underlying reader fails at that point (e.g. the connection is closed concurrently), the panic is not recovered and crashes the program.Observed in CI as a
TestTcpNonceConnectionfailure (https://github.com/godbus/dbus/actions/runs/35775562848/job/106907758461):Skip the padding explicitly and return the read error instead.