lwtunnel: get nlsize for erspan options properly

erspan v1 has OPT_ERSPAN_INDEX while erspan v2 has OPT_ERSPAN_DIR and
OPT_ERSPAN_HWID attributes, and they require different nlsize when
dumping.

So this patch is to get nlsize for erspan options properly according
to erspan version.

Fixes: b0a21810bd5e ("lwtunnel: add options setting and dumping for erspan")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index ee71e768eb1d887f449481067c5f1830ca7a9952..e444cd12e864153a6bc7bbf708a38c3c44e51e13 100644 (file)
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -613,9 +613,15 @@ static int ip_tun_opts_nlsize(struct ip_tunnel_info *info)
                opt_len += nla_total_size(0)    /* LWTUNNEL_IP_OPTS_VXLAN */
                           + nla_total_size(4); /* OPT_VXLAN_GBP */
        } else if (info->key.tun_flags & TUNNEL_ERSPAN_OPT) {
+               struct erspan_metadata *md = ip_tunnel_info_opts(info);
+
                opt_len += nla_total_size(0)    /* LWTUNNEL_IP_OPTS_ERSPAN */
                           + nla_total_size(1)  /* OPT_ERSPAN_VER */
-                          + nla_total_size(4); /* OPT_ERSPAN_INDEX/DIR/HWID */
+                          + (md->version == 1 ? nla_total_size(4)
+                                               /* OPT_ERSPAN_INDEX (v1) */
+                                              : nla_total_size(1) +
+                                                nla_total_size(1));
+                                               /* OPT_ERSPAN_DIR + HWID (v2) */
        }
 
        return opt_len;