[stable] Fix TcpListener::accept() on x86 Android on stable by disabling the use of accept4. #82475
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
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
stable-nominated
|
Nominating for stable backport (though I don't think a stable point release is likely at this time), but reassigning to @joshtriplett who reviewed parts of this in the libc repository. r? @joshtriplett |
|
This seems like a reasonable approach for a low-impact fix on stable. @bors r+ |
|
📌 Commit 960cb69 has been approved by |
bors
added
S-waiting-on-bors
|
@bors r- We don't generally want to merge into stable branch currently unless we're intending to make a stable point release, which isn't currently the case. Marking as stable-accepted. |
bors
added
S-waiting-on-author
Mark-Simulacrum
added
the
stable-accepted
|
@Mark-Simulacrum Ah, thanks; I didn't know the procedure there. |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 5, 2021
…=joshtriplett [beta] Fix TcpListener::accept() on x86 Android on beta by disabling the use of accept4. This is the same as rust-lang#82475, but for beta. In a nutshell: `TcpListener::accept` is broken on Android x86 on stable and beta because it performs a raw `accept4` syscall, which doesn't exist on that platform. This was originally reported in rust-lang#82400, so you can find more details there. `@rustbot` label +O-android r? `@Mark-Simulacrum`
Mark-Simulacrum
removed
stable-accepted
|
We won't be making a point release this cycle, so closing. |
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.
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.This PR fixes it by simply falling back to
accepton x86 Android platforms.Note that for the main branch it would be nice to fix the issue with #82473, rust-lang/libc#2079 and another libc bump. However, if that can't happen before the next beta release, then a similar fix as this PR should be applied on the main branch too.
@rustbot label +O-android
r? @Mark-Simulacrum