systemd: re-enable bpf-framework#328648
Merged
Mic92 merged 1 commit intoNixOS:stagingfrom Jul 21, 2024
Merged
Conversation
systemd meson.build apparently didn't check properly that the option was enabled in all code paths, so it was possible to build systemd such as --version would have -BPF_FRAMEWORK (properly disabled in config.h) with -Dbpf-framework=enabled. Fix the failing check, which was `clang -target bpf` breaking with zerocallusedregs hardening -- this is apparently a known problem as it's disabled in quite a few other packages that mention bpf in comment above the exception... Link: systemd/systemd#33793
Member
Author
|
hmm more packages than I remembered depend on systemd, happy to retarget this to staging |
11 tasks
Member
|
systemd changes definitely need to go to |
arianvp
approved these changes
Jul 20, 2024
13 tasks
1 task
Contributor
|
Successfully created backport PR for |
Contributor
|
Git push to origin failed for staging-24.05 with exitcode 1 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Description of changes
systemd meson.build apparently didn't check properly that the option was enabled in all code paths, so it was possible to build systemd such as --version would have -BPF_FRAMEWORK (properly disabled in config.h) with -Dbpf-framework=enabled.
Fix the failing check, which was
clang -target bpfbreaking with zerocallusedregs hardening -- this is apparently a known problem as it's disabled in quite a few other packages that mention bpf in comment above the exception...Link: systemd/systemd#33793
I noticed SocketBindDeny didn't work when testing cryptpad hardening...
This can easily be confirmed with
systemctl --versionwhich lists-BPF_FRAMEWORKwithout this, and + with it.Fixing the hardening to do the right thing and automatically skip itself if -target bpf is out of scope and might be done later, but I've already spent more time on this than I have available right now.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.