Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests/hardened: Fix usage with 5.8 #99622

Merged
merged 1 commit into from Oct 5, 2020
Merged

tests/hardened: Fix usage with 5.8 #99622

merged 1 commit into from Oct 5, 2020

Conversation

NeQuissimus
Copy link
Member

@NeQuissimus NeQuissimus commented Oct 5, 2020 •
edited

Linux >= 5.8 improved /proc mount options. hidepid=2 is now
displayed as hidepid=invisible

Motivation for this change

Fix hardened test, address comments in 4712b94
Will allow release-20.09 to revert ad3a5d5

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Fixes #99600

@NeQuissimus
tests/hardened: Fix usage with 5.8
03197f9 
Linux >= 5.8 improved /proc mount options. `hidepid=2` is now
displayed as `hidepid=invisible`
@NeQuissimus NeQuissimus added 6.topic: kernel 9.needs: port to stable A PR needs a backport to the stable release. 6.topic: testing Tooling for automated testing of packages and modules labels Oct 5, 2020
NeQuissimus referenced this pull request Oct 5, 2020
@NeQuissimus
linux-hardened: 5.7 -> 5.8
4712b94
@NeQuissimus NeQuissimus mentioned this pull request Oct 5, 2020
Closed
@vcunat
Copy link
Member

vcunat commented Oct 5, 2020 •
edited

Oh, I had checked that the test was still succeeding on nixpkgs master and didn't see a difference in our expressions, but apparently I missed something.

@NeQuissimus
Copy link
Member Author

On master, the test should fail earlier actually, because of #99624

vcunat
vcunat approved these changes Oct 5, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expression looks good. I also tested it on 20.09 with 5.8.

I'd probably write it in a single grep invocation, but I don't think that matters.

@vcunat
Copy link
Member

vcunat commented Oct 5, 2020

Oh, and thanks!

@NeQuissimus NeQuissimus merged commit 0913d8c into NixOS:master Oct 5, 2020
@NeQuissimus NeQuissimus deleted the fix_hardened_58 branch October 5, 2020 15:31
NeQuissimus added a commit that referenced this pull request Oct 5, 2020
@NeQuissimus
Merge pull request #99622 from NeQuissimus/fix_hardened_58
e178d83 
tests/hardened: Fix usage with 5.8

(cherry picked from commit 0913d8c)
@NeQuissimus
Copy link
Member Author

I picked to release-20.09 (e178d83) and reverted the revert (1b40fb3)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

@joachifm joachifm Awaiting requested review from joachifm joachifm is a code owner

Assignees
No one assigned
Labels
6.topic: nixos 6.topic: testing Tooling for automated testing of packages and modules 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[20.09] nixosTests.latestKernel.hardened fails
2 participants
@NeQuissimus @vcunat