From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>,
passt-dev@passt.top, Laurent Vivier <lvivier@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v2 4/5] udp: Fix incorrect usage of IPv6 state in IPv4 path
Date: Wed, 28 Feb 2024 16:39:28 +1100 [thread overview]
Message-ID: <20240228053929.1570254-5-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20240228053929.1570254-1-david@gibson.dropbear.id.au>
When forwarding IPv4 packets in udp_tap_handler(), we incorrectly use an
IPv6 address test on our IPv4 address (which could cause an out of bounds
access), and possibly set our bind interface to the IPv6 interface based on
it. Adjust to correctly look at the IPv4 address and IPv4 interface.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
udp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/udp.c b/udp.c
index 561ba604..d55a6827 100644
--- a/udp.c
+++ b/udp.c
@@ -875,8 +875,8 @@ int udp_tap_handler(struct ctx *c, uint8_t pif,
};
const char *bind_if = NULL;
- if (!IN6_IS_ADDR_LOOPBACK(&s_in.sin_addr))
- bind_if = c->ip6.ifname_out;
+ if (!IN4_IS_ADDR_LOOPBACK(&s_in.sin_addr))
+ bind_if = c->ip4.ifname_out;
if (!IN4_IS_ADDR_UNSPECIFIED(&c->ip4.addr_out) &&
!IN4_IS_ADDR_LOOPBACK(&s_in.sin_addr))
--
@@ -875,8 +875,8 @@ int udp_tap_handler(struct ctx *c, uint8_t pif,
};
const char *bind_if = NULL;
- if (!IN6_IS_ADDR_LOOPBACK(&s_in.sin_addr))
- bind_if = c->ip6.ifname_out;
+ if (!IN4_IS_ADDR_LOOPBACK(&s_in.sin_addr))
+ bind_if = c->ip4.ifname_out;
if (!IN4_IS_ADDR_UNSPECIFIED(&c->ip4.addr_out) &&
!IN4_IS_ADDR_LOOPBACK(&s_in.sin_addr))
--
2.43.2
next prev parent reply other threads:[~2024-02-28 5:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-28 5:39 [PATCH v2 0/5] Assorted small fixes for UDP David Gibson
2024-02-28 5:39 ` [PATCH v2 1/5] udp: Don't attempt to translate a 0.0.0.0 source address David Gibson
2024-02-28 5:39 ` [PATCH v2 2/5] udp: Set pif in epoll reference for ephemeral host sockets David Gibson
2024-02-28 5:39 ` [PATCH v2 3/5] udp: Small streamline to udp_update_hdr4() David Gibson
2024-02-28 5:39 ` David Gibson [this message]
2024-02-28 5:39 ` [PATCH v2 5/5] udp: Remove unnecessary test for unspecified addr_out David Gibson
2024-02-29 8:10 ` [PATCH v2 0/5] Assorted small fixes for UDP Stefano Brivio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240228053929.1570254-5-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=lvivier@redhat.com \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).