From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by passt.top (Postfix, from userid 1000) id 78F8A5A004E; Fri, 21 Jun 2024 17:53:23 +0200 (CEST) From: Stefano Brivio To: passt-dev@passt.top Subject: [PATCH 1/2] Revert "udp: Make rport calculation more local" Date: Fri, 21 Jun 2024 17:53:22 +0200 Message-ID: <20240621155323.1313483-2-sbrivio@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240621155323.1313483-1-sbrivio@redhat.com> References: <20240621155323.1313483-1-sbrivio@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: HRPEDEZV72BLHIF6WKVU3MXPVSXWUJVB X-Message-ID-Hash: HRPEDEZV72BLHIF6WKVU3MXPVSXWUJVB X-MailFrom: sbrivio@passt.top X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Laurent Jacquot , David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This reverts commit c80fa6a6bb4415ad48f9e11424310875d0d99bc7, as it reintroduces the issue fixed by commit 1e6f92b995a9 ("udp: Fix 16-bit overflow in udp_invert_portmap()"). Reported-by: Laurent Jacquot Link: https://bugs.passt.top/show_bug.cgi?id=80 Signed-off-by: Stefano Brivio --- udp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/udp.c b/udp.c index e79ca93..8181900 100644 --- a/udp.c +++ b/udp.c @@ -279,9 +279,10 @@ static void udp_invert_portmap(struct udp_fwd_ports *fwd) "Forward and reverse delta arrays must have same size"); for (i = 0; i < ARRAY_SIZE(fwd->f.delta); i++) { in_port_t delta = fwd->f.delta[i]; + in_port_t rport = i + delta; if (delta) - fwd->rdelta[i + delta] = NUM_PORTS - delta; + fwd->rdelta[rport] = NUM_PORTS - delta; } } -- 2.43.0