virtionet: Fix 'path too long' issues with virtio-net unixgram Support #195
Conversation
This file contains 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
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
cfergeau
force-pushed
the
unixsocket
branch
from
3c19443
to
8f5a7e2
Compare
baude
reviewed
Sep 21, 2024
pkg/vf/virtionet.go
Outdated
| if err != nil { | ||
| return err | ||
| } | ||
| // FIXME: need to remove localSocketPath at process exit | ||
| if len(localSocketPath) >= 104 { | ||
| return fmt.Errorf("socket path is too long: %d", len(localSocketPath)) |
There was a problem hiding this comment.
maybe add the max value here ?
There was a problem hiding this comment.
I've changed it to
+ if len(localSocketPath) >= maxUnixgramPathLen {
+ return fmt.Errorf("unixgram path '%s' is too long: %d >= %d bytes", localSocketPath, len(localSocketPath), maxUnixgramPathLen)
+ }
dd2d840
to
5e826b5
Compare
cfergeau
force-pushed
the
unixsocket
branch
3 times, most recently
from
1ac61cd
to
444dc28
Compare
|
I've finally updated the tests introduced in d7b2799 |
macos 12 runners are going away: actions/runner-images#10721 Signed-off-by: Christophe Fergeau <[email protected]>
With unixgram sockets, we need to specify a client endpoint, which is a path on the filesystem with a maximum length of 104 bytes on macOS. When using -device virtio-net,unixSocketPath=/tmp/vnet.sock, we need to create a client endpoint before connecting to /tmp/vnet.sock. It's currently put into `/Users/user/Library/Application Support`, which is already fairly long. Depending on the username, the 104 bytes are easily exceeded, this has been causing problems to podman machine. This commit will create the client endpoint in the same directory as the server endpoint, which gives more control to the user of vfkit wrt where this socket is going. This fixes crc-org#194 Signed-off-by: Christophe Fergeau <[email protected]>
Path used for unix socket client/server endpoints have to be less than 104. When this is not the case, `bind: invalid argument` is returned. This commit checks the path length before calling `DialUnix` in order to provide an easier to understand error message. Signed-off-by: Christophe Fergeau <[email protected]>
For communication over unixgram, both the server and the client need an endpoint. They are filesystem paths which must be smaller than 104 bytes. This commit attempts to make them shorter while keeping them unique and non-guessable. Signed-off-by: Christophe Fergeau <[email protected]>
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.
With unixgram sockets, we need to specify a client endpoint, which is a
path on the filesystem with a maximum length of 104 bytes on macOS. When
using -device virtio-net,unixSocketPath=/tmp/vnet.sock, we need to create a
client endpoint before connecting to /tmp/vnet.sock. It's currently put
into
/Users/user/Library/Application Support, which is already fairlylong. Depending on the username, the 104 bytes are easily exceeded, this
has been causing problems to podman machine.
This PR will move the client endpoint to the same dir as the server endpoint to give more control over its location to vfkit users. It will also report a better error when the endpoint path length is more than 104 bytes, and it tries to shorten the client endpoint filename.
This fixes #194