Fix IPv6 sets nftables translation

The parser assumes the set is an IPv4 ipset because IPSET_OPT_FAMILY is
not set.

 # ipset-translate restore < ./ipset-mwan3_set_connected_ipv6.dump
 add table inet global
 add set inet global mwan3_connected_v6 { type ipv6_addr; flags interval; }
 flush set inet global mwan3_connected_v6
 ipset v7.15: Error in line 4: Syntax error: '64' is out of range 0-32

Remove ipset_xlate_type_get(), call ipset_xlate_set_get() instead to
obtain the set type and family.

Reported-by: Florian Eckert <fe@dev.tdt.de>
Fixes: 325af556cd3a ("add ipset to nftables translation infrastructure")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/lib/ipset.c b/lib/ipset.c
index 73e67db88e0d1cb32c67b3829f71ef8755ae43b7..50f86aee045bcbfa6ec92aa7c591991122118571 100644 (file)
--- a/lib/ipset.c
+++ b/lib/ipset.c
@@ -949,18 +949,6 @@ ipset_xlate_set_get(struct ipset *ipset, const char *name)
        return NULL;
 }
 
-static const struct ipset_type *ipset_xlate_type_get(struct ipset *ipset,
-                                                    const char *name)
-{
-       const struct ipset_xlate_set *set;
-
-       set = ipset_xlate_set_get(ipset, name);
-       if (!set)
-               return NULL;
-
-       return set->type;
-}
-
 static int
 ipset_parser(struct ipset *ipset, int oargc, char *oargv[])
 {
@@ -1282,8 +1270,16 @@ ipset_parser(struct ipset *ipset, int oargc, char *oargv[])
                if (!ipset->xlate) {
                        type = ipset_type_get(session, cmd);
                } else {
-                       type = ipset_xlate_type_get(ipset, arg0);
-                       ipset_session_data_set(session, IPSET_OPT_TYPE, type);
+                       const struct ipset_xlate_set *xlate_set;
+
+                       xlate_set = ipset_xlate_set_get(ipset, arg0);
+                       if (xlate_set) {
+                               ipset_session_data_set(session, IPSET_OPT_TYPE,
+                                                      xlate_set->type);
+                               ipset_session_data_set(session, IPSET_OPT_FAMILY,
+                                                      &xlate_set->family);
+                               type = xlate_set->type;
+                       }
                }
                if (type == NULL)
                        return ipset->standard_error(ipset, p);

diff --git a/tests/xlate/xlate.t b/tests/xlate/xlate.t
index b1e7d288e2a984fd88b450f6a0ac3c962fbcebcb..f09cb202bb6c0bdf4ebcaa99845c4914771df7af 100644 (file)
--- a/tests/xlate/xlate.t
+++ b/tests/xlate/xlate.t
@@ -53,3 +53,5 @@ create bp1 bitmap:port range 1-1024
 add bp1 22
 create bim1 bitmap:ip,mac range 1.1.1.0/24
 add bim1 1.1.1.1,aa:bb:cc:dd:ee:ff
+create hn6 hash:net family inet6
+add hn6 fe80::/64

diff --git a/tests/xlate/xlate.t.nft b/tests/xlate/xlate.t.nft
index 96eba3b0175ea7c5a09ac61c0fc1bccf38d5ceae..0152a308112583240aa8c5d249c62b79ee10f6c2 100644 (file)
--- a/tests/xlate/xlate.t.nft
+++ b/tests/xlate/xlate.t.nft
@@ -54,3 +54,5 @@ add set inet global bp1 { type inet_service; }
 add element inet global bp1 { 22 }
 add set inet global bim1 { type ipv4_addr . ether_addr; }
 add element inet global bim1 { 1.1.1.1 . aa:bb:cc:dd:ee:ff }
+add set inet global hn6 { type ipv6_addr; flags interval; }
+add element inet global hn6 { fe80::/64 }