Skip to content

Commit

Permalink
Drop setting vm.heap_stack_gap and net.ipv4 sysctl flags
Browse files Browse the repository at this point in the history
These are now set via the securedrop-grsec metapackage (see
<freedomofpress/kernel-builder#55>).

Tests are left in to verify the migration works properly.

Refs #7323.
  • Loading branch information
legoktm committed Nov 6, 2024
1 parent eb39e65 commit 37f1827
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 51 deletions.
30 changes: 0 additions & 30 deletions install_files/ansible-base/roles/common/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,6 @@ disabled_kernel_modules:
- iwlmvm
- iwlwifi

sysctl_flags:
- name: "net.ipv4.tcp_max_syn_backlog"
value: "4096"
- name: "net.ipv4.tcp_syncookies"
value: "1"
- name: "net.ipv4.conf.all.rp_filter"
value: "1"
- name: "net.ipv4.conf.all.accept_source_route"
value: "0"
- name: "net.ipv4.conf.all.accept_redirects"
value: "0"
- name: "net.ipv4.conf.all.secure_redirects"
value: "0"
- name: "net.ipv4.conf.default.rp_filter"
value: "1"
- name: "net.ipv4.conf.default.accept_source_route"
value: "0"
- name: "net.ipv4.conf.default.accept_redirects"
value: "0"
- name: "net.ipv4.conf.default.secure_redirects"
value: "0"
- name: "net.ipv4.icmp_echo_ignore_broadcasts"
value: "1"
- name: "net.ipv4.ip_forward"
value: "0"
- name: "net.ipv4.conf.all.send_redirects"
value: "0"
- name: "net.ipv4.conf.default.send_redirects"
value: "0"

unused_packages:
- libiw30
- wireless-tools
Expand Down
2 changes: 0 additions & 2 deletions install_files/ansible-base/roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@

- include_tasks: remove_unused_packages.yml

- include_tasks: sysctl.yml

- include_tasks: disable_swap.yml

- include_tasks: remove_kernel_modules.yml
14 changes: 0 additions & 14 deletions install_files/ansible-base/roles/common/tasks/sysctl.yml

This file was deleted.

5 changes: 0 additions & 5 deletions install_files/ansible-base/roles/grsecurity/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,3 @@ grsec_sysctl_flags:
# rest will not be applied
- name: "kernel.grsecurity.grsec_lock"
value: "1"
# Stack clash mitigation, increasing main stack gap to 1MB.
# Storing as part of grsecurity vars, because sysctl option won't
# exist otherwise.
- name: "vm.heap_stack_gap"
value: "1048576"
1 change: 1 addition & 0 deletions molecule/testinfra/common/test_grsecurity.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ def test_grsecurity_kernel_is_running(host):
[
("kernel.grsecurity.grsec_lock", 1),
("kernel.grsecurity.rwxmap_logging", 0),
# set via securedrop-grsec (in kernel-builder)
("vm.heap_stack_gap", 1048576),
],
)
Expand Down
2 changes: 2 additions & 0 deletions molecule/testinfra/common/test_system_hardening.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ def test_sysctl_options(host, sysctl_opt):
"""
Ensure sysctl flags are set correctly. Most of these checks
are hardening IPv4, which is appropriate due to the heavy use of Tor.
These are all set via securedrop-grsec (in kernel-builder).
"""
with host.sudo():
assert host.sysctl(sysctl_opt[0]) == sysctl_opt[1]
Expand Down

0 comments on commit 37f1827

Please sign in to comment.