Repository navigation
Fix VSOCK address reuse on reconnect - #403
Open
milouz1985 wants to merge 1 commit into
Open
milouz1985 wants to merge 1 commit into
milouz1985 wants to merge 1 commit into
Conversation
connect_vsock() overwrites the colon in sshfs.vsock, so subsequent connection attempts cannot parse the saved address, even when the first socket() or connect() call fails. Let strtoul() stop at the colon and keep the address const, preserving the existing CID and port parsing behavior. Add Linux unit tests that reuse the same address after a successful connection, a socket() failure and a connect() failure. Mock the socket calls so no VSOCK device or FUSE mount is needed.
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
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.
Summary
Fix VSOCK reconnection failures caused by modifying the stored
CID:PORTaddress during connection setup.Problem
connect_vsock()replaces the colon separator with a null terminator when parsing the CID. This permanently modifies the stored address, which is reused for subsequent connections.After a connection interruption, reconnection attempts fail because the address can no longer be parsed, leaving the FUSE mount active but returning I/O errors.
Fix
Parse the CID without modifying the original VSOCK address.
Add three regression tests covering:
Validation
-Dwerror=true: passed.The manual test confirmed that SSHFS reconnects after the SFTP server is interrupted and restarted, without remounting the filesystem.