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.

Sign up for GitHub

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

nixos/nginx: fix MemoryDenyWriteExecute not being disabled when needed #111011

Merged
merged 1 commit into from Mar 3, 2021
Merged

nixos/nginx: fix MemoryDenyWriteExecute not being disabled when needed #111011

merged 1 commit into from Mar 3, 2021

Conversation

waldheinz
Copy link
Contributor

@waldheinz waldheinz commented Jan 28, 2021 •
edited

The expression should check if the actually used nginx package
needes write+execute rights, not the default pkgs.nginx (which
has no modules unless overridden in an overlay).

Having MemoryDenyWriteExecute always true causes e.g. the Lua
module to fail (because JIT compilation).

Motivation for this change
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.

@waldheinz
nixos/nginx: fix MemoryDenyWriteExecute not being disabled when needed
7d2829c 
The expression should check if the actually used nginx package
needes write+execute rights, not the default pkgs.nginx (which
has no modules unless overridden in an overlay).

Having MemoryDenyWriteExecute always true causes e.g. the Lua
module to fail (because JIT compilation).
ajs124
ajs124 approved these changes Feb 1, 2021
View reviewed changes
Copy link
Member

@ajs124 ajs124 left a comment

Choose a reason for hiding this comment

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

Not tested, but looks reasonable to me.

@ajs124 ajs124 requested a review from Izorkin February 1, 2021 17:37
@aanderse aanderse merged commit 9798ed1 into NixOS:master Mar 3, 2021
@waldheinz waldheinz deleted the nginx-mem-write-exec branch March 3, 2021 12:42
@ajs124 ajs124 mentioned this pull request Mar 10, 2021
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ajs124 ajs124 ajs124 approved these changes

@megheaiulian megheaiulian megheaiulian approved these changes

@hmenke hmenke hmenke approved these changes

@Izorkin Izorkin Izorkin approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@waldheinz @ajs124 @megheaiulian @hmenke @Izorkin @aanderse