[beta] Fix TcpListener::accept() on x86 Android on beta by disabling the use of accept4. #82476
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
On x86 before Linux 4.3, accept4 is not a separate syscall. Instead, it can be called using `socketcall(SYS_ACCEPT4, ...). Rather than implementing that here, just fall back to `accept`.
|
rust-highfive
added
the
S-waiting-on-review
Mark-Simulacrum
changed the title
Mark-Simulacrum
added
beta-nominated
|
Similarly to the stable PR, nominated for beta backport (really just merging, as the PR already targets beta branch), but also reassigning to @joshtriplett who reviewed parts of this in the libc repository. r? @joshtriplett |
|
As with the stable PR, this seems like a reasonable approach to minimize changes. I prefer the approach of switching to socketcall, but that's more invasive, so this seems fine for beta. @bors r+ |
|
📌 Commit 695b048 has been approved by |
bors
added
S-waiting-on-bors
apiraino
added
the
beta-accepted
|
@bors rollup=never |
|
@bors p=1 |
|
☀️ Test successful - checks-actions |
cuviper
removed
the
beta-nominated
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.
This is the same as #82475, but for beta.
In a nutshell:
TcpListener::acceptis broken on Android x86 on stable and beta because it performs a rawaccept4syscall, which doesn't exist on that platform. This was originally reported in #82400, so you can find more details there.@rustbot label +O-android
r? @Mark-Simulacrum