From 7c32c52dfb4f9c98826212ec1c5eec9b31c8f8f3 Mon Sep 17 00:00:00 2001 From: cenhuilin Date: Mon, 7 Jul 2025 10:34:36 +0800 Subject: [PATCH] fix CVE-2024-6174 --- cloud-init.spec | 10 ++- fix-CVE-2024-6174-1.patch | 167 ++++++++++++++++++++++++++++++++++++++ fix-CVE-2024-6174-2.patch | 80 ++++++++++++++++++ 3 files changed, 256 insertions(+), 1 deletion(-) create mode 100644 fix-CVE-2024-6174-1.patch create mode 100644 fix-CVE-2024-6174-2.patch diff --git a/cloud-init.spec b/cloud-init.spec index 9e04395..a5f3ab3 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 25.1 -Release: 1 +Release: 2 Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. License: ASL 2.0 or GPLv3 URL: http://launchpad.net/cloud-init @@ -12,6 +12,8 @@ Patch1: bugfix-sort-requirements.patch Patch2: add-variable-to-forbid-tmp-dir.patch Patch3: delete-config-nopasswd-all.patch Patch4: skip-test_ntp_custom_client_overrides_installed_clie.patch +Patch5: fix-CVE-2024-6174-1.patch +Patch6: fix-CVE-2024-6174-2.patch BuildRequires: pkgconfig(systemd) python3-devel python3-setuptools systemd BuildRequires: iproute python3-configobj python3-responses @@ -142,6 +144,12 @@ fi %exclude /usr/share/doc/* %changelog +* Mon Jul 07 2025 cenhuilin - 25.1-2 +- Type:cve +- CVE:NA +- SUG:NA +- DESC:fix CVE-2024-6174 + * Tue Feb 25 2025 shixuantong - 25.1-1 - Type:bugfix - CVE:NA diff --git a/fix-CVE-2024-6174-1.patch b/fix-CVE-2024-6174-1.patch new file mode 100644 index 0000000..eceab77 --- /dev/null +++ b/fix-CVE-2024-6174-1.patch @@ -0,0 +1,167 @@ +From f43937f0b462734eb9c76700491c18fe4133c8e1 Mon Sep 17 00:00:00 2001 +From: Brett Holman +Date: Mon, 7 Jul 2025 10:19:50 +0800 +Subject: [PATCH] fix: Don't attempt to identify non-x86 OpenStack instances + +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. + +--- + doc/rtd/reference/breaking_changes.rst | 49 ++++++++++++++++++++++++++ + tests/unittests/test_ds_identify.py | 13 ++++--- + tools/ds-identify | 8 ++--- + 3 files changed, 59 insertions(+), 11 deletions(-) + +diff --git a/doc/rtd/reference/breaking_changes.rst b/doc/rtd/reference/breaking_changes.rst +index db59b62..176eea5 100644 +--- a/doc/rtd/reference/breaking_changes.rst ++++ b/doc/rtd/reference/breaking_changes.rst +@@ -11,6 +11,54 @@ releases. + many operating system vendors patch out breaking changes in + cloud-init to ensure consistent behavior on their platform. + ++25.1.3 ++====== ++ ++Strict datasource identity before network ++----------------------------------------- ++Affects detection of Ec2, OpenStack or AltCloud datasources for non-x86 ++architectures where DMI may not be accessible.Expand commentComment on line R20Code has comments. Press enter to view. ++ ++Datasource detection provided by ds-identify in cloud-init now requires strict ++identification based on DMI platform information, kernel command line or ++`datasource_list:` system configuration in /etc/cloud/cloud.cfg.d. ++ ++Prior to this change, ds-identify would allow non-x86 architectures without ++strict identifying platform information to run in a discovery mode which would ++attempt to reach out to well known static link-local IPs to attempt to ++retrieve configuration once system networking is up. ++ ++To mitigate the potential of a bad-actor in a local network responding ++to such provisioning requests from cloud-init clients, ds-identify will no ++longer allow this late discovery mode for platforms unable to expose clear ++identifying characteristics of a known cloud-init datasource. ++ ++The most likely affected cloud platforms are AltCloud, Ec2 and OpenStack for ++non-x86 architectures where DMI data is not exposed by the kernel. ++ ++If your non-x86 architecture or images no longer detect the proper datasource, ++any of the following steps can ensure proper detection of cloud-init config: ++ ++- Provide kernel commandline containing ``ds=`` ++ which forces ds-identify to discover a specific datasource. ++- Image creators: provide a config file part such as ++ :file:`/etc/cloud/cloud.cfg.d/*.cfg` containing the ++ case-sensitive ``datasource_list: [ ]`` to force cloud-init ++ to use a specific datasource without performing discovery. ++ ++For example, to force OpenStack discovery in cloud-init any of the following ++approaches work: ++ ++- OpenStack: `attach a ConfigDrive`_ as an alternative config source ++- Kernel command line containing ``ds=openstack`` ++- Custom images provide :file:`/etc/cloud/cloud.cfg.d/91-set-datasource.cfg` ++ containing: ++ ++.. code-block:: yaml ++ ++ datasource_list: [ OpenStack ] ++ ++ + 25.1 + ==== + +@@ -162,5 +210,6 @@ Workarounds include updating the kernel command line and optionally configuring + a ``datasource_list`` in ``/etc/cloud/cloud.cfg.d/*.cfg``. + + ++.. _attach a ConfigDrive: https://docs.openstack.org/nova/2024.1/admin/config-drive.html + .. _this patch: https://github.com/canonical/cloud-init/blob/ubuntu/noble/debian/patches/no-single-process.patch + .. _Python3 equivalent: https://github.com/canonical/cloud-init/pull/5489#issuecomment-2408210561 +diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py +index 309acd3..3b9d70a 100644 +--- a/tests/unittests/test_ds_identify.py ++++ b/tests/unittests/test_ds_identify.py +@@ -208,9 +208,9 @@ system_info: + """ + + 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" + +@@ -947,7 +947,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""" +@@ -967,10 +967,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 ac0f82f..ec33710 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 +@@ -100,8 +100,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.43.0 + diff --git a/fix-CVE-2024-6174-2.patch b/fix-CVE-2024-6174-2.patch new file mode 100644 index 0000000..f7f0ec0 --- /dev/null +++ b/fix-CVE-2024-6174-2.patch @@ -0,0 +1,80 @@ +From e3f42adc2674a38fb29e414cfbf96f884934b2d2 Mon Sep 17 00:00:00 2001 +From: Chad Smith +Date: Mon, 7 Jul 2025 10:26:46 +0800 +Subject: [PATCH] fix: strict disable in ds-identify on no datasources found + +Take the CVE-2024-6174 strict detection fix one step further. + +Commit 8c3ae1b took a step to ignore DS_MAYBE datasource discovery. +But, if no datasources are met the DS_FOUND conditions, ds-identify was +still leaving cloud-init enabled. This resulted in cloud-init python +code attempting to discover all datasources later in boot based on +the default datasource_list. + +ds-identify will now assert that at least one datasource is found. If +no datasources, ds-identify will exit 1 which disables cloud-init boot +stages and results in no boot configuration operations from cloud-init. + +OpenStack images which cannot identify a valid datasource with DMI-data +or kernel command line ci.ds=OpenStack parameter will need to either: +- provide image-based configuration in either /etc/cloud/cloud.cfg.* to set + datasource_list: [ OpenStack ] +- provide --config-drive true to openstack server create +- attach a nocloud disk labelled CIDATA containing user-data and + meta-data files + +CVE-2024-6174 +LP: #2069607 + +--- + tests/unittests/test_ds_identify.py | 6 ++++-- + tools/ds-identify | 2 +- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py +index 3b9d70a..45894d3 100644 +--- a/tests/unittests/test_ds_identify.py ++++ b/tests/unittests/test_ds_identify.py +@@ -210,7 +210,7 @@ system_info: + POLICY_FOUND_ONLY = "search,found=all,maybe=none,notfound=disabled" + 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_DEFAULT_POLICY_NO_DMI = "search,found=all,maybe=none,notfound=disabled" + DI_EC2_STRICT_ID_DEFAULT = "true" + OVF_MATCH_STRING = "http://schemas.dmtf.org/ovf/environment/1" + +@@ -957,7 +957,7 @@ class TestDsIdentify(DsIdentifyBase): + data.update( + { + "policy_dmi": POLICY_FOUND_OR_MAYBE, +- "policy_no_dmi": POLICY_FOUND_OR_MAYBE, ++ "policy_no_dmi": DI_DEFAULT_POLICY_NO_DMI, + } + ) + +@@ -970,6 +970,8 @@ class TestDsIdentify(DsIdentifyBase): + (_, _, err, _, _) = self._check_via_dict(data, RC_NOT_FOUND) + self.assertIn("check for 'OpenStack' returned maybe", err) + self.assertIn("No ds found", err) ++ self.assertIn("Disabled cloud-init", err) ++ self.assertIn("returning 1", 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 ec33710..e6efa40 100755 +--- a/tools/ds-identify ++++ b/tools/ds-identify +@@ -101,7 +101,7 @@ DI_MAIN=${DI_MAIN:-main} + DI_BLKID_EXPORT_OUT="" + DI_GEOM_LABEL_STATUS_OUT="" + 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_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=none,notfound=${DI_DISABLED}" + DI_DMI_BOARD_NAME="" + DI_DMI_CHASSIS_ASSET_TAG="" + DI_DMI_PRODUCT_NAME="" +-- +2.43.0 + -- Gitee