netfilter: nft_tunnel: also dump OPTS_ERSPAN/VXLAN

This patch is to add the nest attr OPTS_ERSPAN/VXLAN when dumping
KEY_OPTS, and it would be helpful when parsing in userpace. Also,
this is needed for supporting multiple geneve opts in the future
patches.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c
index b3a9b10..eb17402 100644 (file)
--- a/net/netfilter/nft_tunnel.c
+++ b/net/netfilter/nft_tunnel.c
@@ -468,17 +468,24 @@ static int nft_tunnel_opts_dump(struct sk_buff *skb,
                                struct nft_tunnel_obj *priv)
 {
        struct nft_tunnel_opts *opts = &priv->opts;
-       struct nlattr *nest;
+       struct nlattr *nest, *inner;
 
        nest = nla_nest_start_noflag(skb, NFTA_TUNNEL_KEY_OPTS);
        if (!nest)
                return -1;
 
        if (opts->flags & TUNNEL_VXLAN_OPT) {
+               inner = nla_nest_start_noflag(skb, NFTA_TUNNEL_KEY_OPTS_VXLAN);
+               if (!inner)
+                       return -1;
                if (nla_put_be32(skb, NFTA_TUNNEL_KEY_VXLAN_GBP,
                                 htonl(opts->u.vxlan.gbp)))
                        return -1;
+               nla_nest_end(skb, inner);
        } else if (opts->flags & TUNNEL_ERSPAN_OPT) {
+               inner = nla_nest_start_noflag(skb, NFTA_TUNNEL_KEY_OPTS_ERSPAN);
+               if (!inner)
+                       return -1;
                if (nla_put_be32(skb, NFTA_TUNNEL_KEY_ERSPAN_VERSION,
                                 htonl(opts->u.erspan.version)))
                        return -1;
@@ -496,6 +503,7 @@ static int nft_tunnel_opts_dump(struct sk_buff *skb,
                                return -1;
                        break;
                }
+               nla_nest_end(skb, inner);
        }
        nla_nest_end(skb, nest);