Skip to content

Fix socket address family checks#1736

Merged
bors[bot] merged 3 commits intonix-rust:masterfrom
qwandor:sockaddr
Jun 9, 2022
Merged

Fix socket address family checks#1736
bors[bot] merged 3 commits intonix-rust:masterfrom
qwandor:sockaddr

Conversation

@qwandor
Copy link
Copy Markdown
Contributor

@qwandor qwandor commented Jun 7, 2022

The SockaddrLike::from_raw implementations for VsockAddr and SysControlAddr were checking against the wrong address family constant. This PR makes them consistent with the values matched against in SockaddrStorage::from_raw.

@asomers
Copy link
Copy Markdown
Member

asomers commented Jun 7, 2022

Ahh, thank you. That's probably a copy/paste error on my part. Could you please add a "Fixed" entry to CHANGELOG?

@qwandor
Copy link
Copy Markdown
Contributor Author

qwandor commented Jun 7, 2022

Done.

@rtzoeller
Copy link
Copy Markdown
Collaborator

@asomers any idea what's going on with the FreeBSD 14 timeouts? I've noticed that on a few recent PRs.

I have a fix submitted for Haiku, we're just waiting on a new nightly rustc to be available.

@asomers
Copy link
Copy Markdown
Member

asomers commented Jun 7, 2022

No, I saw that too but I haven't had time to investigate yet.

@asomers
Copy link
Copy Markdown
Member

asomers commented Jun 8, 2022

It looks like test_acct is the culprit. When I run it locally its runtime varies anywhere from a few seconds to 3m. It's just a matter of when does the kernel decide to flush the accounting file, and I don't think userland has any control over that.

@rtzoeller
Copy link
Copy Markdown
Collaborator

@asomers this seems like another patch candidate.

@rtzoeller
Copy link
Copy Markdown
Collaborator

bors r+

@bors bors bot merged commit b3ba2b5 into nix-rust:master Jun 9, 2022
@qwandor qwandor deleted the sockaddr branch June 9, 2022 07:46
@qwandor
Copy link
Copy Markdown
Contributor Author

qwandor commented Jun 20, 2022

Hi, any idea when you plan to push a release with this fix included?

@asomers
Copy link
Copy Markdown
Member

asomers commented Jun 20, 2022

I think the only remaining issue that we should consider for a patch release is #1709 , if indeed that turns out to be a bug in Nix.

@rtzoeller
Copy link
Copy Markdown
Collaborator

@qwandor this should be in a 0.24.2 patch release now.

@rtzoeller rtzoeller added this to the 0.24.2 milestone Jul 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants