Commit ed02551f authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

lwtunnel: change to use nla_parse_nested on new options 



As the new options added in kernel, all should always use strict
parsing from the beginning with nla_parse_nested(), instead of
nla_parse_nested_deprecated().

Fixes: b0a21810 ("lwtunnel: add options setting and dumping for erspan")
Fixes: edf31cbb ("lwtunnel: add options setting and dumping for vxlan")
Fixes: 4ece4778 ("lwtunnel: add options setting and dumping for geneve")
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe2b8a88

net/ipv4/ip_tunnel_core.c

+8 −8
Original line number Diff line number Diff line
@@ -257,8 +257,8 @@ static int ip_tun_parse_opts_geneve(struct nlattr *attr, 
	struct nlattr *tb[LWTUNNEL_IP_OPT_GENEVE_MAX + 1];

	int data_len, err;



	err = nla_parse_nested_deprecated(tb, LWTUNNEL_IP_OPT_GENEVE_MAX,

					  attr, geneve_opt_policy, extack);

	err = nla_parse_nested(tb, LWTUNNEL_IP_OPT_GENEVE_MAX, attr,

			       geneve_opt_policy, extack);

	if (err)

		return err;
@@ -294,8 +294,8 @@ static int ip_tun_parse_opts_vxlan(struct nlattr *attr, 
	struct nlattr *tb[LWTUNNEL_IP_OPT_VXLAN_MAX + 1];

	int err;



	err = nla_parse_nested_deprecated(tb, LWTUNNEL_IP_OPT_VXLAN_MAX,

					  attr, vxlan_opt_policy, extack);

	err = nla_parse_nested(tb, LWTUNNEL_IP_OPT_VXLAN_MAX, attr,

			       vxlan_opt_policy, extack);

	if (err)

		return err;
@@ -320,8 +320,8 @@ static int ip_tun_parse_opts_erspan(struct nlattr *attr, 
	struct nlattr *tb[LWTUNNEL_IP_OPT_ERSPAN_MAX + 1];

	int err;



	err = nla_parse_nested_deprecated(tb, LWTUNNEL_IP_OPT_ERSPAN_MAX,

					  attr, erspan_opt_policy, extack);

	err = nla_parse_nested(tb, LWTUNNEL_IP_OPT_ERSPAN_MAX, attr,

			       erspan_opt_policy, extack);

	if (err)

		return err;
@@ -362,7 +362,7 @@ static int ip_tun_parse_opts(struct nlattr *attr, struct ip_tunnel_info *info, 
	if (!attr)

		return 0;



	err = nla_parse_nested_deprecated(tb, LWTUNNEL_IP_OPTS_MAX, attr,

	err = nla_parse_nested(tb, LWTUNNEL_IP_OPTS_MAX, attr,

			       ip_opts_policy, extack);

	if (err)

		return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE