Fix sync_pipe_fd validation to include file descriptor 0 #622
Conversation
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
This commit addresses multiple issues related to sync_pipe_fd handling: 1. Change sync_pipe_fd checks from > 0 to >= 0 to properly handle the case where file descriptor 0 is used for the sync pipe. 2. Add missing error reporting in terminal_accept_cb() when receiving the console file descriptor fails. Previously, conmon would call pexit() directly, exiting without writing to sync_pipe_fd. This caused podman to receive empty data and show JSON parse errors. 3. Add missing error reporting when pidfile read fails. Previously, if g_file_get_contents() failed to read the container pidfile, conmon would exit(1) without writing to sync_pipe_fd, causing podman to receive empty data and show JSON parse errors. This fix ensures that when the runtime fails (e.g., due to missing cgroup controllers), conmon properly reports the error to podman instead of silently closing the pipe. Fixes: containers/podman#27335 Signed-off-by: Jindrich Novy <jnovy@redhat.com>
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.
Change sync_pipe_fd checks from > 0 to >= 0 to properly handle the case where file descriptor 0 is used for the sync pipe.
Fixes: containers/podman#27335