Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lwtunnel: change to use nla_parse_nested on new options

Browse Source 
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: b0a21810bd5e ("lwtunnel: add options setting and dumping for erspan")
Fixes: edf31cbb1502 ("lwtunnel: add options setting and dumping for vxlan")
Fixes: 4ece47787077 ("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>
This commit is contained in:
Xin Long 2019-11-10 12:16:22 +08:00 committed by David S. Miller
parent fe2b8a8808
commit ed02551f58
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/ipv4/ip_tunnel_core.c
View File

@ -257,8 +257,8 @@ static int ip_tun_parse_opts_geneve(struct nlattr *attr,
struct nlattr *tb[LWTUNNEL_IP_OPT_GENEVE_MAX + 1]; struct nlattr *tb[LWTUNNEL_IP_OPT_GENEVE_MAX + 1];
int data_len, err; int data_len, err;
err = nla_parse_nested_deprecated(tb, LWTUNNEL_IP_OPT_GENEVE_MAX, err = nla_parse_nested(tb, LWTUNNEL_IP_OPT_GENEVE_MAX, attr,
attr, geneve_opt_policy, extack); geneve_opt_policy, extack);
if (err) if (err)
return 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]; struct nlattr *tb[LWTUNNEL_IP_OPT_VXLAN_MAX + 1];
int err; int err;
err = nla_parse_nested_deprecated(tb, LWTUNNEL_IP_OPT_VXLAN_MAX, err = nla_parse_nested(tb, LWTUNNEL_IP_OPT_VXLAN_MAX, attr,
attr, vxlan_opt_policy, extack); vxlan_opt_policy, extack);
if (err) if (err)
return 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]; struct nlattr *tb[LWTUNNEL_IP_OPT_ERSPAN_MAX + 1];
int err; int err;
err = nla_parse_nested_deprecated(tb, LWTUNNEL_IP_OPT_ERSPAN_MAX, err = nla_parse_nested(tb, LWTUNNEL_IP_OPT_ERSPAN_MAX, attr,
attr, erspan_opt_policy, extack); erspan_opt_policy, extack);
if (err) if (err)
return err; return err;
@ -362,7 +362,7 @@ static int ip_tun_parse_opts(struct nlattr *attr, struct ip_tunnel_info *info,
if (!attr) if (!attr)
return 0; 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); ip_opts_policy, extack);
if (err) if (err)
return err; return err;