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

Update grsecurity kernels to 4.14.175 #5188

Merged
merged 4 commits into from
Apr 9, 2020
Merged

Update grsecurity kernels to 4.14.175 #5188

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da07ca7
Update grsecurity kernels to 4.14.175
Apr 6, 2020
13147a7
Updates kernel config tests for /boot perms
Apr 8, 2020
d3e5c73
Removes old kernel dependencies from metapackage
Apr 8, 2020
12bdfc9
Update TBB version to 9.0.9
Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions install_files/ansible-base/group_vars/all/securedrop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ enable_ssh_over_tor: true
# the many roles of the current prod playbook
securedrop_cond_reboot_file: /tmp/sd-reboot-now

# If you bump this, also remember to bump in molecule/builder/tests/vars.yml
# If you bump this, also remember to bump in molecule/builder-xenial/tests/vars.yml
securedrop_pkg_grsec:
ver: "4.14.154"
depends: "linux-image-4.14.154-grsec-securedrop,linux-image-4.4.182-grsec,linux-firmware-image-4.4.182-grsec,intel-microcode"
ver: "4.14.175"
depends: "linux-image-4.14.175-grsec-securedrop,linux-image-4.4.182-grsec,linux-firmware-image-4.4.182-grsec,intel-microcode"
Copy link
Contributor

Choose a reason for hiding this comment

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

is there a reason we are still dependending on an older 4.4 series kernel, and not the last known good kernel (4.14.154)? should we not simply preserve the previous known good kernel version

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great point, @emkll. I admit the same issue gave my pause while making the update. Will raise in standup today to make sure support team doesn't have any concerns, then proceed with updating to current-and-previous as standard going forward.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No concerns raised in standup, proceeding with updating the pinned dependencies as suggested.

2 changes: 1 addition & 1 deletion molecule/builder-xenial/tests/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ securedrop_version: "1.3.0~rc1"
ossec_version: "3.0.0"
keyring_version: "0.1.3"
config_version: "0.1.3"
grsec_version: "4.14.154"
grsec_version: "4.14.175"

# These values will be interpolated with values populated above
# via helper functions in the tests.
Expand Down
26 changes: 14 additions & 12 deletions molecule/testinfra/staging/common/test_grsecurity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,12 @@ def test_wireless_disabled_in_kernel_config(host, kernel_opts):
remove wireless support from the kernel. Let's make sure wireless is
disabled in the running kernel config!
"""
with host.sudo():
kernel_config_path = "/boot/config-{}-grsec-securedrop".format(KERNEL_VERSION)
kernel_config = host.file(kernel_config_path).content_string

kernel_config_path = "/boot/config-{}-grsec-securedrop".format(KERNEL_VERSION)
kernel_config = host.file(kernel_config_path).content_string

line = "# CONFIG_{} is not set".format(kernel_opts)
assert line in kernel_config
line = "# CONFIG_{} is not set".format(kernel_opts)
assert line in kernel_config


@pytest.mark.parametrize('kernel_opts', [
Expand All @@ -203,11 +203,12 @@ def test_kernel_options_enabled_config(host, kernel_opts):
Tests kernel config for options that should be enabled
"""

kernel_config_path = "/boot/config-{}-grsec-securedrop".format(KERNEL_VERSION)
kernel_config = host.file(kernel_config_path).content_string
with host.sudo():
kernel_config_path = "/boot/config-{}-grsec-securedrop".format(KERNEL_VERSION)
kernel_config = host.file(kernel_config_path).content_string

line = "{}=y".format(kernel_opts)
assert line in kernel_config
line = "{}=y".format(kernel_opts)
assert line in kernel_config


def test_mds_mitigations_and_smt_disabled(host):
Expand All @@ -216,7 +217,8 @@ def test_mds_mitigations_and_smt_disabled(host):
see https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html
"""

grub_config_path = "/boot/grub/grub.cfg"
grub_config = host.file(grub_config_path)
with host.sudo():
grub_config_path = "/boot/grub/grub.cfg"
grub_config = host.file(grub_config_path)

assert grub_config.contains("mds=full,nosmt")
assert grub_config.contains("mds=full,nosmt")
2 changes: 1 addition & 1 deletion molecule/testinfra/staging/vars/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,4 @@ log_events_with_ossec_alerts:
rule_id: "400700"

fpf_apt_repo_url: "https://apt-test.freedom.press"
grsec_version: "4.14.154"
grsec_version: "4.14.175"