From 18e552274905c631f685e2870735a526a9028f97 Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Wed, 14 Aug 2024 23:15:36 +0000
Subject: [PATCH] import passt-0%5E20240806.gee36266-2.el10
---
...-if-guest-attempts-to-connect-to-por.patch | 64 +++++++++++++++++++
SPECS/passt.spec | 11 +++-
2 files changed, 72 insertions(+), 3 deletions(-)
create mode 100644 SOURCES/0001-flow-Don-t-crash-if-guest-attempts-to-connect-to-por.patch
diff --git a/SOURCES/0001-flow-Don-t-crash-if-guest-attempts-to-connect-to-por.patch b/SOURCES/0001-flow-Don-t-crash-if-guest-attempts-to-connect-to-por.patch
new file mode 100644
index 0000000..343864f
--- /dev/null
+++ b/SOURCES/0001-flow-Don-t-crash-if-guest-attempts-to-connect-to-por.patch
@@ -0,0 +1,64 @@
+From 002b2a23380d4df552bac7665d462ac4c7bced0b Mon Sep 17 00:00:00 2001
+From: David Gibson <david@gibson.dropbear.id.au>
+Date: Wed, 14 Aug 2024 20:03:33 +1000
+Subject: [PATCH] flow: Don't crash if guest attempts to connect to port 0
+
+Using a zero port on TCP or UDP is dubious, and we can't really deal with
+forwarding such a flow within the constraints of the socket API. Hence
+we ASSERT()ed that we had non-zero ports in flow_hash().
+
+The intention was to make sure that the protocol code sanitizes such ports
+before completing a flow entry. Unfortunately, flow_hash() is also called
+on new packets to see if they have an existing flow, so the unsanitized
+guest packet can crash passt with the assert.
+
+Correct this by moving the assert from flow_hash() to flow_sidx_hash()
+which is only used on entries already in the table, not on unsanitized
+data.
+
+Reported-by: Reported-by: Matt Hamilton <matt@thmail.io>
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
+---
+ flow.c | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/flow.c b/flow.c
+index 687e9fd..93b687d 100644
+--- a/flow.c
++++ b/flow.c
+@@ -561,12 +561,6 @@ static uint64_t flow_hash(const struct ctx *c, uint8_t proto, uint8_t pif,
+ {
+ struct siphash_state state = SIPHASH_INIT(c->hash_secret);
+
+- /* For the hash table to work, we need complete endpoint information,
+- * and at least a forwarding port.
+- */
+- ASSERT(pif != PIF_NONE && !inany_is_unspecified(&side->eaddr) &&
+- side->eport != 0 && side->fport != 0);
+-
+ inany_siphash_feed(&state, &side->faddr);
+ inany_siphash_feed(&state, &side->eaddr);
+
+@@ -586,8 +580,16 @@ static uint64_t flow_hash(const struct ctx *c, uint8_t proto, uint8_t pif,
+ static uint64_t flow_sidx_hash(const struct ctx *c, flow_sidx_t sidx)
+ {
+ const struct flow_common *f = &flow_at_sidx(sidx)->f;
+- return flow_hash(c, FLOW_PROTO(f),
+- f->pif[sidx.sidei], &f->side[sidx.sidei]);
++ const struct flowside *side = &f->side[sidx.sidei];
++ uint8_t pif = f->pif[sidx.sidei];
++
++ /* For the hash table to work, entries must have complete endpoint
++ * information, and at least a forwarding port.
++ */
++ ASSERT(pif != PIF_NONE && !inany_is_unspecified(&side->eaddr) &&
++ side->eport != 0 && side->fport != 0);
++
++ return flow_hash(c, FLOW_PROTO(f), pif, side);
+ }
+
+ /**
+--
+2.43.0
+
diff --git a/SPECS/passt.spec b/SPECS/passt.spec
index 0c5d7fe..6529d00 100644
--- a/SPECS/passt.spec
+++ b/SPECS/passt.spec
@@ -12,14 +12,16 @@
Name: passt
Version: 0^20240806.gee36266
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: User-mode networking daemons for virtual machines and namespaces
License: GPL-2.0-or-later AND BSD-3-Clause
Group: System Environment/Daemons
URL: https://passt.top/
Source: https://passt.top/passt/snapshot/passt-%{git_hash}.tar.xz
-BuildRequires: gcc, make, checkpolicy, selinux-policy-devel
+Patch1: 0001-flow-Don-t-crash-if-guest-attempts-to-connect-to-por.patch
+
+BuildRequires: gcc, make, git, checkpolicy, selinux-policy-devel
Requires: (%{name}-selinux = %{version}-%{release} if selinux-policy-%{selinuxtype})
%description
@@ -47,7 +49,7 @@ Requires(preun): policycoreutils
This package adds SELinux enforcement to passt(1) and pasta(1).
%prep
-%setup -q -n passt-%{git_hash}
+%autosetup -S git_am -n passt-%{git_hash}
%build
%set_build_flags
@@ -124,6 +126,9 @@ fi
%{_datadir}/selinux/packages/%{selinuxtype}/pasta.pp
%changelog
+* Wed Aug 14 2024 Stefano Brivio <sbrivio@redhat.com> - 0^20240806-gee36266-2
+- Resolves: RHEL-54269
+
* Wed Aug 7 2024 Stefano Brivio <sbrivio@redhat.com> - 0^20240806.gee36266-1
- Resolves: RHEL-53190
--
GitLab