From 5f36d42e42fb32abb55c69b47749a60d8de98dbf Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Thu, 22 Aug 2024 16:54:53 -0600 Subject: [PATCH 1/2] fix: Don't attempt to identify non-x86 OpenStack instances RH-Author: Ani Sinha RH-MergeRequest: 163: CVE-2024-6174: fix: Don't attempt to identify non-x86 OpenStack instances RH-Jira: RHEL-100606 RH-Acked-by: xiachen RH-Commit: [1/2] 8c759fbd27046038bd52dbd694ca071a3ea6d6cc This causes cloud-init to attempt to reach out to the OpenStack Nova datasource in non-Nova deployments on non-x86 architectures. Change default policy of ds-identify to disallow discovery of datasources without strict identifiable artifacts in either kernel cmdline, DMI platform information or system configuration files. This prevents cloud-init from attempting to reach out to well-known hard-codded link-local IP addresses for configuration information unless the platform strictly identifies as a specific datasource. CVE-2024-6174 LP: #2069607 BREAKING_CHANGE: This may break non-x86 OpenStack Nova users. Affected users may wish to use ConfigDrive as a workaround. (cherry picked from commit 8c3ae1bb9f1d80fbf217b41a222ee434e7f58900) Signed-off-by: Ani Sinha Conflicts: doc/rtd/reference/breaking_changes.rst This doc file does not exist. It was added in 8778506, so ignored. --- tests/unittests/test_ds_identify.py | 13 ++++++------- tools/ds-identify | 8 ++++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py index acbf3f032..c4f0115a8 100644 --- a/tests/unittests/test_ds_identify.py +++ b/tests/unittests/test_ds_identify.py @@ -58,9 +58,9 @@ BLKID_UEFI_UBUNTU = [ POLICY_FOUND_ONLY = "search,found=all,maybe=none,notfound=disabled" -POLICY_FOUND_OR_MAYBE = "search,found=all,maybe=all,notfound=disabled" -DI_DEFAULT_POLICY = "search,found=all,maybe=all,notfound=disabled" -DI_DEFAULT_POLICY_NO_DMI = "search,found=all,maybe=all,notfound=enabled" +POLICY_FOUND_OR_MAYBE = "search,found=all,maybe=none,notfound=disabled" +DI_DEFAULT_POLICY = "search,found=all,maybe=none,notfound=disabled" +DI_DEFAULT_POLICY_NO_DMI = "search,found=all,maybe=none,notfound=enabled" DI_EC2_STRICT_ID_DEFAULT = "true" OVF_MATCH_STRING = "http://schemas.dmtf.org/ovf/environment/1" @@ -574,7 +574,7 @@ class TestDsIdentify(DsIdentifyBase): self._test_ds_found("OpenStack-AssetTag-Compute") def test_openstack_on_non_intel_is_maybe(self): - """On non-Intel, openstack without dmi info is maybe. + """On non-Intel, openstack without dmi info is none. nova does not identify itself on platforms other than intel. https://bugs.launchpad.net/cloud-init/+bugs?field.tag=dsid-nova""" @@ -594,10 +594,9 @@ class TestDsIdentify(DsIdentifyBase): # updating the uname to ppc64 though should get a maybe. data.update({"mocks": [MOCK_VIRT_IS_KVM, MOCK_UNAME_IS_PPC64]}) - (_, _, err, _, _) = self._check_via_dict( - data, RC_FOUND, dslist=["OpenStack", "None"] - ) + (_, _, err, _, _) = self._check_via_dict(data, RC_NOT_FOUND) self.assertIn("check for 'OpenStack' returned maybe", err) + self.assertIn("No ds found", err) def test_default_ovf_is_found(self): """OVF is identified found when ovf/ovf-env.xml seed file exists.""" diff --git a/tools/ds-identify b/tools/ds-identify index 6e49ded36..87b320f56 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -14,7 +14,7 @@ # The format is: # ,found=value,maybe=value,notfound=value # default setting is: -# search,found=all,maybe=all,notfound=disabled +# search,found=all,maybe=none,notfound=disabled # # kernel command line option: ci.di.policy= # example line in /etc/cloud/ds-identify.cfg: @@ -40,7 +40,7 @@ # first: use the first found do no further checking # all: enable all DS_FOUND # -# maybe: (default=all) +# maybe: (default=none) # if nothing returned 'found', then how to handle maybe. # no network sources are allowed to return 'maybe'. # all: enable all DS_MAYBE @@ -94,8 +94,8 @@ DI_MAIN=${DI_MAIN:-main} DI_BLKID_EXPORT_OUT="" DI_GEOM_LABEL_STATUS_OUT="" -DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_DISABLED}" -DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=all,notfound=${DI_ENABLED}" +DI_DEFAULT_POLICY="search,found=all,maybe=none,notfound=${DI_DISABLED}" +DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=none,notfound=${DI_ENABLED}" DI_DMI_BOARD_NAME="" DI_DMI_CHASSIS_ASSET_TAG="" DI_DMI_PRODUCT_NAME="" -- 2.39.3