From: Jeremy Sowden <jeremy@azazel.net>
To: Jan Engelhardt <jengelh@inai.de>
Cc: Netfilter Devel <netfilter-devel@vger.kernel.org>,
"Thomas B . Clark" <kernel@clark.bz>
Subject: [PATCH xtables-addons 3/3] xt_geoip: fix in6_addr little-endian byte-swapping.
Date: Sat, 30 Nov 2019 17:02:19 +0000 [thread overview]
Message-ID: <20191130170219.368867-5-jeremy@azazel.net> (raw)
In-Reply-To: <20191130170219.368867-1-jeremy@azazel.net>
libxt_geoip attempts to byte-swap IPv6 addresses on little-endian
systems but it doesn't get it quite right. Rather than doing ntohl on
each 32-bit segment, it does ntohs on each 16-bit segment.
This means that:
1234::cdef
becomes:
2143::dcfe
instead of:
4321::fedc
Fixes: b91dbd03c717 ("geoip: store database in network byte order")
Reported-by: "Thomas B. Clark" <kernel@clark.bz>
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
extensions/libxt_geoip.c | 28 ++++++++--------------------
1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/extensions/libxt_geoip.c b/extensions/libxt_geoip.c
index 116f5f86eb01..5b8697dc6161 100644
--- a/extensions/libxt_geoip.c
+++ b/extensions/libxt_geoip.c
@@ -50,26 +50,6 @@ static struct option geoip_opts[] = {
};
#if __BYTE_ORDER == __LITTLE_ENDIAN
-static void geoip_swap_le16(uint16_t *buf)
-{
- unsigned char *p = (void *)buf;
- uint16_t n= p[0] + (p[1] << 8);
- p[0] = (n >> 8) & 0xff;
- p[1] = n & 0xff;
-}
-
-static void geoip_swap_in6(struct in6_addr *in6)
-{
- geoip_swap_le16(&in6->s6_addr16[0]);
- geoip_swap_le16(&in6->s6_addr16[1]);
- geoip_swap_le16(&in6->s6_addr16[2]);
- geoip_swap_le16(&in6->s6_addr16[3]);
- geoip_swap_le16(&in6->s6_addr16[4]);
- geoip_swap_le16(&in6->s6_addr16[5]);
- geoip_swap_le16(&in6->s6_addr16[6]);
- geoip_swap_le16(&in6->s6_addr16[7]);
-}
-
static void geoip_swap_le32(uint32_t *buf)
{
unsigned char *p = (void *)buf;
@@ -79,6 +59,14 @@ static void geoip_swap_le32(uint32_t *buf)
p[2] = (n >> 8) & 0xff;
p[3] = n & 0xff;
}
+
+static void geoip_swap_in6(struct in6_addr *in6)
+{
+ geoip_swap_le32(&in6->s6_addr32[0]);
+ geoip_swap_le32(&in6->s6_addr32[1]);
+ geoip_swap_le32(&in6->s6_addr32[2]);
+ geoip_swap_le32(&in6->s6_addr32[3]);
+}
#endif
static void *
--
2.24.0
next prev parent reply other threads:[~2019-11-30 17:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-11 12:52 geoip doesn't work with ipv6 Thomas B. Clark
2019-11-30 15:24 ` Jeremy Sowden
2019-11-30 17:02 ` [PATCH xtables-addons 0/3] xt_geoip: ipv6 fixes Jeremy Sowden
2019-11-30 17:02 ` [PATCH xtables-addons 1/3] configure: Fix max. supported kernel version Jeremy Sowden
2019-11-30 17:05 ` Jeremy Sowden
2019-11-30 17:02 ` [PATCH xtables-addons 1/3] configure: update " Jeremy Sowden
2019-11-30 17:02 ` [PATCH xtables-addons 2/3] xt_geoip: white-space fixes Jeremy Sowden
2019-11-30 17:02 ` Jeremy Sowden [this message]
2019-11-30 17:11 ` [PATCH xtables-addons 3/3] xt_geoip: fix in6_addr little-endian byte-swapping Jeremy Sowden
2019-11-30 17:58 ` [PATCH xtables-addons v2 0/3] xt_geoip: ipv6 fixes Jeremy Sowden
2019-11-30 17:58 ` [PATCH xtables-addons v2 1/3] configure: update max. supported kernel version Jeremy Sowden
2019-11-30 17:58 ` [PATCH xtables-addons v2 2/3] xt_geoip: white-space fixes Jeremy Sowden
2019-11-30 17:58 ` [PATCH xtables-addons v2 3/3] xt_geoip: fix in6_addr little-endian byte-swapping Jeremy Sowden
2019-12-01 10:34 ` [PATCH xtables-addons v2 0/3] xt_geoip: ipv6 fixes Jan Engelhardt
2019-12-01 14:00 ` Jeremy Sowden
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=20191130170219.368867-5-jeremy@azazel.net \
--to=jeremy@azazel.net \
--cc=jengelh@inai.de \
--cc=kernel@clark.bz \
--cc=netfilter-devel@vger.kernel.org \
/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.
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 NNTP newsgroup(s).