|
 |
18074eb |
From 6c6a870ececab6eac0065e3a1f539f30bfb0cd25 Mon Sep 17 00:00:00 2001
|
|
|
18074eb |
From: Phil Sutter <phil@nwl.cc>
|
|
|
18074eb |
Date: Fri, 19 Feb 2021 16:54:57 +0100
|
|
|
18074eb |
Subject: [PATCH] nft: Fix bitwise expression avoidance detection
|
|
|
18074eb |
|
|
|
18074eb |
Byte-boundary prefix detection was too sloppy: Any data following the
|
|
|
18074eb |
first zero-byte was ignored. Add a follow-up loop making sure there are
|
|
|
18074eb |
no stray bits in the designated host part.
|
|
|
18074eb |
|
|
|
18074eb |
Fixes: 323259001d617 ("nft: Optimize class-based IP prefix matches")
|
|
|
18074eb |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
18074eb |
(cherry picked from commit 330f5df03ad589b46865ceedf2a54cf10a4225ba)
|
|
|
18074eb |
---
|
|
|
18074eb |
iptables/nft-shared.c | 4 +++-
|
|
|
18074eb |
.../testcases/ip6tables/0004-address-masks_0 | 24 +++++++++++++++++++
|
|
|
18074eb |
2 files changed, 27 insertions(+), 1 deletion(-)
|
|
|
18074eb |
create mode 100755 iptables/tests/shell/testcases/ip6tables/0004-address-masks_0
|
|
|
18074eb |
|
|
|
18074eb |
diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c
|
|
|
18074eb |
index 10553ab26823b..c1664b50f9383 100644
|
|
|
18074eb |
--- a/iptables/nft-shared.c
|
|
|
18074eb |
+++ b/iptables/nft-shared.c
|
|
|
18074eb |
@@ -166,7 +166,7 @@ void add_addr(struct nftnl_rule *r, enum nft_payload_bases base, int offset,
|
|
|
18074eb |
{
|
|
|
18074eb |
const unsigned char *m = mask;
|
|
|
18074eb |
bool bitwise = false;
|
|
|
18074eb |
- int i;
|
|
|
18074eb |
+ int i, j;
|
|
|
18074eb |
|
|
|
18074eb |
for (i = 0; i < len; i++) {
|
|
|
18074eb |
if (m[i] != 0xff) {
|
|
|
18074eb |
@@ -174,6 +174,8 @@ void add_addr(struct nftnl_rule *r, enum nft_payload_bases base, int offset,
|
|
|
18074eb |
break;
|
|
|
18074eb |
}
|
|
|
18074eb |
}
|
|
|
18074eb |
+ for (j = i + 1; !bitwise && j < len; j++)
|
|
|
18074eb |
+ bitwise = !!m[j];
|
|
|
18074eb |
|
|
|
18074eb |
if (!bitwise)
|
|
|
18074eb |
len = i;
|
|
|
18074eb |
diff --git a/iptables/tests/shell/testcases/ip6tables/0004-address-masks_0 b/iptables/tests/shell/testcases/ip6tables/0004-address-masks_0
|
|
|
18074eb |
new file mode 100755
|
|
|
18074eb |
index 0000000000000..7eb42f08da975
|
|
|
18074eb |
--- /dev/null
|
|
|
18074eb |
+++ b/iptables/tests/shell/testcases/ip6tables/0004-address-masks_0
|
|
|
18074eb |
@@ -0,0 +1,24 @@
|
|
|
18074eb |
+#!/bin/bash
|
|
|
18074eb |
+
|
|
|
18074eb |
+set -e
|
|
|
18074eb |
+
|
|
|
18074eb |
+$XT_MULTI ip6tables-restore <
|
|
|
18074eb |
+*filter
|
|
|
18074eb |
+-A FORWARD -s feed:babe::/ffff::0
|
|
|
18074eb |
+-A FORWARD -s feed:babe::/ffff:ff00::0
|
|
|
18074eb |
+-A FORWARD -s feed:babe::/ffff:fff0::0
|
|
|
18074eb |
+-A FORWARD -s feed:babe::/ffff:ffff::0
|
|
|
18074eb |
+-A FORWARD -s feed:babe::/0:ffff::0
|
|
|
18074eb |
+-A FORWARD -s feed:c0ff::babe:f00/ffff::ffff:0
|
|
|
18074eb |
+COMMIT
|
|
|
18074eb |
+EOF
|
|
|
18074eb |
+
|
|
|
18074eb |
+EXPECT='-P FORWARD ACCEPT
|
|
|
18074eb |
+-A FORWARD -s feed::/16
|
|
|
18074eb |
+-A FORWARD -s feed:ba00::/24
|
|
|
18074eb |
+-A FORWARD -s feed:bab0::/28
|
|
|
18074eb |
+-A FORWARD -s feed:babe::/32
|
|
|
18074eb |
+-A FORWARD -s 0:babe::/0:ffff::
|
|
|
18074eb |
+-A FORWARD -s feed::babe:0/ffff::ffff:0'
|
|
|
18074eb |
+
|
|
|
18074eb |
+diff -u -Z <(echo -e "$EXPECT") <($XT_MULTI ip6tables -S FORWARD)
|
|
|
18074eb |
--
|
|
|
18074eb |
2.31.1
|
|
|
18074eb |
|