From: wenxu <we...@ucloud.cn>

Add ipv6 tunnel check in nft_tunnel_mode_validate.

Signed-off-by: wenxu <we...@ucloud.cn>
---
v4: new patch

 net/netfilter/nft_tunnel.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c
index fe544bf..64bda3d 100644
--- a/net/netfilter/nft_tunnel.c
+++ b/net/netfilter/nft_tunnel.c
@@ -18,8 +18,12 @@ struct nft_tunnel {
        enum nft_tunnel_mode    mode:8;
 };
 
-bool nft_tunnel_mode_validate(enum nft_tunnel_mode priv_mode, u8 tun_mode)
+bool nft_tunnel_mode_validate(enum nft_tunnel_mode priv_mode,
+                             u8 tun_mode, bool ipv6)
 {
+       if (ipv6 && !(tun_mode & IP_TUNNEL_INFO_IPV6))
+               return false;
+
        if (priv_mode == NFT_TUNNEL_MODE_NONE ||
            (priv_mode == NFT_TUNNEL_MODE_RX &&
             !(tun_mode & IP_TUNNEL_INFO_TX)) ||
@@ -46,7 +50,7 @@ static void nft_tunnel_get_eval(const struct nft_expr *expr,
                        nft_reg_store8(dest, false);
                        return;
                }
-               if (nft_tunnel_mode_validate(priv->mode, tun_info->mode))
+               if (nft_tunnel_mode_validate(priv->mode, tun_info->mode, false))
                        nft_reg_store8(dest, true);
                else
                        nft_reg_store8(dest, false);
@@ -56,7 +60,7 @@ static void nft_tunnel_get_eval(const struct nft_expr *expr,
                        regs->verdict.code = NFT_BREAK;
                        return;
                }
-               if (nft_tunnel_mode_validate(priv->mode, tun_info->mode))
+               if (nft_tunnel_mode_validate(priv->mode, tun_info->mode, false))
                        *dest = ntohl(tunnel_id_to_key32(tun_info->key.tun_id));
                else
                        regs->verdict.code = NFT_BREAK;
@@ -66,7 +70,7 @@ static void nft_tunnel_get_eval(const struct nft_expr *expr,
                        regs->verdict.code = NFT_BREAK;
                        return;
                }
-               if (nft_tunnel_mode_validate(priv->mode, tun_info->mode))
+               if (nft_tunnel_mode_validate(priv->mode, tun_info->mode, false))
                        *dest = tun_info->key.u.ipv4.src;
                else
                        regs->verdict.code = NFT_BREAK;
@@ -76,7 +80,7 @@ static void nft_tunnel_get_eval(const struct nft_expr *expr,
                        regs->verdict.code = NFT_BREAK;
                        return;
                }
-               if (nft_tunnel_mode_validate(priv->mode, tun_info->mode))
+               if (nft_tunnel_mode_validate(priv->mode, tun_info->mode, false))
                        *dest = tun_info->key.u.ipv4.dst;
                else
                        regs->verdict.code = NFT_BREAK;
-- 
1.8.3.1

Reply via email to