diff --git a/0001-virarptable-Properly-calculate-rtattr-length.patch b/0001-virarptable-Properly-calculate-rtattr-length.patch new file mode 100644 index 0000000..7253056 --- /dev/null +++ b/0001-virarptable-Properly-calculate-rtattr-length.patch @@ -0,0 +1,35 @@ +From adfdb79f1e01401349e1321d0f5059d7b6489f00 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Martin Kletzander +Date: Fri, 16 Aug 2024 13:56:51 +0200 +Subject: [PATCH 1/3] virarptable: Properly calculate rtattr length +Content-type: text/plain + +Use convenience macro which does almost the same thing we were doing, +but also pads out the payload length to a multiple of NLMSG_ALIGNTO (4) +bytes. + +Signed-off-by: Martin Kletzander +Reviewed-by: Laine Stump +Signed-off-by: Cole Robinson +--- + src/util/virarptable.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/util/virarptable.c b/src/util/virarptable.c +index 299dddd664..d8e41c5a86 100644 +--- a/src/util/virarptable.c ++++ b/src/util/virarptable.c +@@ -102,8 +102,7 @@ virArpTableGet(void) + return table; + + VIR_WARNINGS_NO_CAST_ALIGN +- parse_rtattr(tb, NDA_MAX, NDA_RTA(r), +- nh->nlmsg_len - NLMSG_LENGTH(sizeof(*r))); ++ parse_rtattr(tb, NDA_MAX, NDA_RTA(r), NLMSG_PAYLOAD(nh, sizeof(*r))); + VIR_WARNINGS_RESET + + if (tb[NDA_DST] == NULL || tb[NDA_LLADDR] == NULL) +-- +2.46.0 + diff --git a/0002-virarptable-Fix-check-for-message-length.patch b/0002-virarptable-Fix-check-for-message-length.patch new file mode 100644 index 0000000..2014dd9 --- /dev/null +++ b/0002-virarptable-Fix-check-for-message-length.patch @@ -0,0 +1,42 @@ +From 137779b894858bd958ea575cec260a0559b31e48 Mon Sep 17 00:00:00 2001 +Message-ID: <137779b894858bd958ea575cec260a0559b31e48.1724763718.git.crobinso@redhat.com> +In-Reply-To: +References: +From: Martin Kletzander +Date: Fri, 16 Aug 2024 13:59:15 +0200 +Subject: [PATCH 2/3] virarptable: Fix check for message length +Content-type: text/plain + +The previous check was all wrong since it calculated the how long would +the netlink message be if the netlink header was the payload and then +subtracted that from the whole message length, a variable that was not +used later in the code. This check can fail if there are no additional +payloads, struct rtattr in particular, which we are parsing later, +however the RTA_OK macro would've caught that anyway. + +Signed-off-by: Martin Kletzander +Reviewed-by: Laine Stump +Signed-off-by: Cole Robinson +--- + src/util/virarptable.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/util/virarptable.c b/src/util/virarptable.c +index d8e41c5a86..45ee76766f 100644 +--- a/src/util/virarptable.c ++++ b/src/util/virarptable.c +@@ -81,10 +81,9 @@ virArpTableGet(void) + for (; NLMSG_OK(nh, msglen); nh = NLMSG_NEXT(nh, msglen)) { + VIR_WARNINGS_RESET + struct ndmsg *r = NLMSG_DATA(nh); +- int len = nh->nlmsg_len; + void *addr; + +- if ((len -= NLMSG_LENGTH(sizeof(*nh))) < 0) { ++ if (nh->nlmsg_len < NLMSG_SPACE(sizeof(*r))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("wrong nlmsg len")); + goto cleanup; +-- +2.46.0 + diff --git a/0003-virarptable-End-parsing-earlier-in-case-of-NLMSG_DON.patch b/0003-virarptable-End-parsing-earlier-in-case-of-NLMSG_DON.patch new file mode 100644 index 0000000..005d095 --- /dev/null +++ b/0003-virarptable-End-parsing-earlier-in-case-of-NLMSG_DON.patch @@ -0,0 +1,54 @@ +From df2cefb31dab2fa56e0864fbd2b8ad468dee22c0 Mon Sep 17 00:00:00 2001 +Message-ID: +In-Reply-To: +References: +From: Martin Kletzander +Date: Fri, 16 Aug 2024 14:02:48 +0200 +Subject: [PATCH 3/3] virarptable: End parsing earlier in case of NLMSG_DONE +Content-type: text/plain + +Check for the last multipart message right as the first thing. The +presumption probably was that the last message might still contain a +payload we want to parse. However that cannot be true since that would +have to be a type RTM_NEWNEIGH. This was not caught because older +kernels were note sending NLMSG_DONE and probably relied on the fact +that the parsing just stops after all the messages are walked through, +which the NLMSG_OK macro successfully did. + +Resolves: https://issues.redhat.com/browse/RHEL-52449 +Resolves: https://bugzilla.redhat.com/2302245 +Fixes: a176d67cdfaf5b8237a7e3a80d8be0e6bdf2d8fd +Signed-off-by: Martin Kletzander +Reviewed-by: Laine Stump +Signed-off-by: Cole Robinson +--- + src/util/virarptable.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/util/virarptable.c b/src/util/virarptable.c +index 45ee76766f..20d11f97b0 100644 +--- a/src/util/virarptable.c ++++ b/src/util/virarptable.c +@@ -83,6 +83,9 @@ virArpTableGet(void) + struct ndmsg *r = NLMSG_DATA(nh); + void *addr; + ++ if (nh->nlmsg_type == NLMSG_DONE) ++ break; ++ + if (nh->nlmsg_len < NLMSG_SPACE(sizeof(*r))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("wrong nlmsg len")); +@@ -97,9 +100,6 @@ virArpTableGet(void) + (!(r->ndm_state == NUD_STALE || r->ndm_state == NUD_REACHABLE))) + continue; + +- if (nh->nlmsg_type == NLMSG_DONE) +- return table; +- + VIR_WARNINGS_NO_CAST_ALIGN + parse_rtattr(tb, NDA_MAX, NDA_RTA(r), NLMSG_PAYLOAD(nh, sizeof(*r))); + VIR_WARNINGS_RESET +-- +2.46.0 + diff --git a/libvirt.spec b/libvirt.spec index 9142fe1..0117e14 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -277,7 +277,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 10.1.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1 URL: https://libvirt.org/ @@ -291,6 +291,11 @@ Patch3: 0001-interface-fix-udev-reference-leak-with-invalid-flags.patch Patch0: fix-virtiofs-socket-label.patch +Patch10: 0001-virarptable-Properly-calculate-rtattr-length.patch +Patch11: 0002-virarptable-Fix-check-for-message-length.patch +Patch12: 0003-virarptable-End-parsing-earlier-in-case-of-NLMSG_DON.patch + + Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} @@ -422,6 +427,7 @@ BuildRequires: libwsman-devel >= 2.6.3 BuildRequires: audit-libs-devel # we need /usr/sbin/dtrace BuildRequires: systemtap-sdt-devel +BuildRequires: /usr/bin/dtrace # For mount/umount in FS driver BuildRequires: util-linux # For showmount in FS driver (netfs discovery) @@ -2593,6 +2599,9 @@ exit 0 %changelog +* Tue Aug 27 2024 Cole Robinson - 10.1.0-4 +- Fix 'virsh domifaddr --source=arp' on kernel 6.10 (bz #2302245) + * Tue Jul 9 2024 Daniel P. Berrangé - 10.1.0-3 - Fix virtiofs SELinux socket label