net: add handling for abstract socket name #6772
Merged
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
mox692
force-pushed
the
mox692/handle_abstract_socket_name
branch
2 times, most recently
from
afe849e to
062c36b
Compare
Darksonn
reviewed
Aug 13, 2024
Contributor
Darksonn
left a comment
Darksonn
left a comment
There was a problem hiding this comment.
This could make sense to release as an 1.39.3. Thoughts?
Member
Author
yes, I agree. |
Contributor
|
I just created a |
mox692
force-pushed
the
mox692/handle_abstract_socket_name
branch
from
aa870b7 to
50fe61a
Compare
Darksonn
approved these changes
Aug 16, 2024
kodiakhq bot
pushed a commit
to pdylanross/fatigue
that referenced
this pull request
Aug 19, 2024
Bumps tokio from 1.39.2 to 1.39.3. Release notes Sourced from tokio's releases. Tokio v1.39.3 1.39.3 (August 17th, 2024) This release fixes a regression where the unix socket api stopped accepting the abstract socket namespace. (#6772) #6772: tokio-rs/tokio#6772 Commits 3d439ab chore: prepare Tokio v1.39.3 (#6782) b2ea40b net: add handling for abstract socket name (#6772) See full diff in compare view Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase. Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: @dependabot rebase will rebase this PR @dependabot recreate will recreate this PR, overwriting any edits that have been made to it @dependabot merge will merge this PR after your CI passes on it @dependabot squash and merge will squash and merge this PR after your CI passes on it @dependabot cancel merge will cancel a previously requested merge and block automerging @dependabot reopen will reopen this PR if it is closed @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
martin-g
reviewed
Sep 10, 2025
| let addr = { | ||
| let os_str_bytes = path.as_ref().as_os_str().as_bytes(); | ||
| if os_str_bytes.starts_with(b"\0") { | ||
| StdSocketAddr::from_abstract_name(os_str_bytes)? |
Member
There was a problem hiding this comment.
I think there might a bug here.
The leading '\0' should not be passed to the StdSocketAddr::from_abstract_name() because this way there will be two leading NUL chars in the final name (i.e. \0\0...).
Here the addr is initialized with mem::zeroed() and later the passed name is copied to the ptr + 1:
crate::ptr::copy_nonoverlapping(
name.as_ptr(),
addr.sun_path.as_mut_ptr().add(1) as *mut u8,
name.len(),
);So, there are two NULs - one from zeroed() and another from name.
Contributor
There was a problem hiding this comment.
Can you open an issue or PR?
martin-g
reviewed
Sep 10, 2025
| let addr = { | ||
| let os_str_bytes = path.as_ref().as_os_str().as_bytes(); | ||
| if os_str_bytes.starts_with(b"\0") { | ||
| StdSocketAddr::from_abstract_name(os_str_bytes)? |
Member
There was a problem hiding this comment.
Same as https://github.com/tokio-rs/tokio/pull/6772/files#r2335889347 if my analysis is correct
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Motivation
Closes #6767.
Solution
If the beginning of the path is
\0, we fallback to std'sfrom_abstract_name.