From 5a76b7b3c455376330e7f51602d4c014f8d0b86f Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 5 Aug 2025 08:38:57 +0000 Subject: [PATCH] import UBI NetworkManager-1.52.0-5.el9_6 --- ...-fix-crash-in-dns-options-rhel-92313.patch | 28 +++++++++++++++++++ SPECS/NetworkManager.spec | 6 +++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 SOURCES/1006-fix-crash-in-dns-options-rhel-92313.patch diff --git a/SOURCES/1006-fix-crash-in-dns-options-rhel-92313.patch b/SOURCES/1006-fix-crash-in-dns-options-rhel-92313.patch new file mode 100644 index 0000000..a3520fc --- /dev/null +++ b/SOURCES/1006-fix-crash-in-dns-options-rhel-92313.patch @@ -0,0 +1,28 @@ +From bf3494ceb989bc8fefb89d2366fe4024a1f055b5 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Fri, 16 May 2025 09:40:31 +0200 +Subject: [PATCH] ip-config: fix crash in DNS options evaluation + +Fixes: 58287cbcc0c8 ('core: rework IP configuration in NetworkManager using layer 3 configuration') +(cherry picked from commit c1350f40bdc769514f637b4b6754c4ff3ef67b66) +(cherry picked from commit 35f11cd6e130299cd554bb97e2c165031ed91a72) +--- + src/core/nm-ip-config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/nm-ip-config.c b/src/core/nm-ip-config.c +index eb0ec9aa03..975ae20d45 100644 +--- a/src/core/nm-ip-config.c ++++ b/src/core/nm-ip-config.c +@@ -826,7 +826,7 @@ _handle_l3cd_changed(NMIPConfig *self, const NML3ConfigData *l3cd) + if (v_i != v_i_old) + changed_params[n_changed_params++] = obj_properties_ip[PROP_IP_DNS_PRIORITY]; + +- strarr_old = nm_l3_config_data_get_dns_options(l3cd_old, addr_family, &len); ++ strarr_old = nm_l3_config_data_get_dns_options(l3cd_old, addr_family, &len_old); + strarr = nm_l3_config_data_get_dns_options(priv->l3cd, addr_family, &len); + if (!nm_strv_equal_n(strarr, len, strarr_old, len_old)) + changed_params[n_changed_params++] = obj_properties_ip[PROP_IP_DNS_OPTIONS]; +-- +2.49.0 + diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index b73a016..f6b5756 100644 --- a/SPECS/NetworkManager.spec +++ b/SPECS/NetworkManager.spec @@ -7,7 +7,7 @@ %global real_version 1.52.0 %global git_tag_version_suffix %{nil} %global rpm_version %{real_version} -%global release_version 4 +%global release_version 5 %global snapshot %{nil} %global git_sha %{nil} %global bcond_default_debug 0 @@ -195,6 +195,7 @@ Patch1002: 1002-oci-update-disconnected-vnics-83198.patch Patch1003: 1003-dns-Fix-invalid-memory-access-on-Dnsconfd-DBUS-error-84692.patch Patch1004: 1004-ovs-allow-reapplying-ovs-bridge-and-ovs-port-properties-87595.patch Patch1005: 1005-core-ovs-fix-NULL-pointer-dereference-in-ovsdb-read-timeout-callback-87347.patch +Patch1006: 1006-fix-crash-in-dns-options-rhel-92313.patch Requires(post): systemd Requires(post): systemd-udev @@ -1086,6 +1087,9 @@ fi %changelog +* Fri Jul 18 2025 Íñigo Huguet - 1:1.52.0-5 +- Fix crash in DNS options evaluation (RHEL-92313) + * Thu May 15 2025 Wen Liang - 1:1.52.0-4 - ovs: allow reapplying ovs-bridge and ovs-port properties (RHEL-87595) - core: ovs: fix NULL pointer dereference in ovsdb read timeout callback (RHEL-87347)