lwtunnel: get nlsize for erspan options properly (58e8494e) · Commits · 戴 / test

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: ("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>

net/ipv4/ip_tunnel_core.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message