Skip to content

Commit

Permalink
lwtunnel: change to use nla_parse_nested on new options
Browse files Browse the repository at this point in the history
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: b0a2181 ("lwtunnel: add options setting and dumping for erspan")
Fixes: edf31cb ("lwtunnel: add options setting and dumping for vxlan")
Fixes: 4ece477 ("lwtunnel: add options setting and dumping for geneve")
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>
  • Loading branch information
Xin Long authored and David S. Miller committed Nov 11, 2019
1 parent fe2b8a8 commit ed02551
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions net/ipv4/ip_tunnel_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand All @@ -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;

Expand Down Expand Up @@ -362,8 +362,8 @@ 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,
ip_opts_policy, extack);
err = nla_parse_nested(tb, LWTUNNEL_IP_OPTS_MAX, attr,
ip_opts_policy, extack);
if (err)
return err;

Expand Down

0 comments on commit ed02551

Please sign in to comment.