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

Upgrade SecureDrop kernels to 4.14.154 #4990

Merged
merged 3 commits into from
Nov 14, 2019
Merged

Upgrade SecureDrop kernels to 4.14.154 #4990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
288e36c
Revert "Revert me: Disable IRDA test"
emkll Nov 13, 2019
6771912
Update grsecurity kernels to 4.14.154
emkll Nov 13, 2019
d2a9dc1
Add regression test for CVE-2019-11135
emkll Nov 13, 2019
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
4 changes: 2 additions & 2 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 @@ -40,5 +40,5 @@ securedrop_cond_reboot_file: /tmp/sd-reboot-now

# If you bump this, also remember to bump in molecule/builder/tests/vars.yml
securedrop_pkg_grsec:
ver: "4.14.152"
depends: "linux-image-4.14.152-grsec-securedrop,linux-image-4.4.182-grsec,linux-firmware-image-4.4.182-grsec,intel-microcode"
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"
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.2.0~rc1"
ossec_version: "3.0.0"
keyring_version: "0.1.3"
config_version: "0.1.3"
grsec_version: "4.14.152"
grsec_version: "4.14.154"

# These values will be interpolated with values populated above
# via helper functions in the tests.
Expand Down
18 changes: 18 additions & 0 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 @@ -176,6 +176,7 @@ def test_pax_flags(host, binary):
'WIMAX',
'WIRELESS',
'HAMRADIO',
'IRDA',
'BT',
])
def test_wireless_disabled_in_kernel_config(host, kernel_opts):
Expand All @@ -192,6 +193,23 @@ def test_wireless_disabled_in_kernel_config(host, kernel_opts):
assert line in kernel_config


@pytest.mark.parametrize('kernel_opts', [
'CONFIG_X86_INTEL_TSX_MODE_OFF',
'CONFIG_PAX',
'CONFIG_GRKERNSEC',
])
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

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


def test_mds_mitigations_and_smt_disabled(host):
"""
Ensure that full mitigations are in place for MDS
Expand Down
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 @@ -192,4 +192,4 @@ log_events_with_ossec_alerts:
rule_id: "400700"

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