Commit 1841b982 authored by Xin Long's avatar Xin Long Committed by David S. Miller

lwtunnel: check erspan options before allocating tun_info

As Jakub suggested on another patch, it's better to do the check
on erspan options before allocating memory.
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b6a70f7
...@@ -321,6 +321,7 @@ static int ip_tun_parse_opts_erspan(struct nlattr *attr, ...@@ -321,6 +321,7 @@ 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;
u8 ver;
err = nla_parse_nested(tb, LWTUNNEL_IP_OPT_ERSPAN_MAX, attr, err = nla_parse_nested(tb, LWTUNNEL_IP_OPT_ERSPAN_MAX, attr,
erspan_opt_policy, extack); erspan_opt_policy, extack);
...@@ -330,24 +331,31 @@ static int ip_tun_parse_opts_erspan(struct nlattr *attr, ...@@ -330,24 +331,31 @@ static int ip_tun_parse_opts_erspan(struct nlattr *attr,
if (!tb[LWTUNNEL_IP_OPT_ERSPAN_VER]) if (!tb[LWTUNNEL_IP_OPT_ERSPAN_VER])
return -EINVAL; return -EINVAL;
ver = nla_get_u8(tb[LWTUNNEL_IP_OPT_ERSPAN_VER]);
if (ver == 1) {
if (!tb[LWTUNNEL_IP_OPT_ERSPAN_INDEX])
return -EINVAL;
} else if (ver == 2) {
if (!tb[LWTUNNEL_IP_OPT_ERSPAN_DIR] ||
!tb[LWTUNNEL_IP_OPT_ERSPAN_HWID])
return -EINVAL;
} else {
return -EINVAL;
}
if (info) { if (info) {
struct erspan_metadata *md = struct erspan_metadata *md =
ip_tunnel_info_opts(info) + opts_len; ip_tunnel_info_opts(info) + opts_len;
attr = tb[LWTUNNEL_IP_OPT_ERSPAN_VER]; md->version = ver;
md->version = nla_get_u8(attr); if (ver == 1) {
if (md->version == 1 && tb[LWTUNNEL_IP_OPT_ERSPAN_INDEX]) {
attr = tb[LWTUNNEL_IP_OPT_ERSPAN_INDEX]; attr = tb[LWTUNNEL_IP_OPT_ERSPAN_INDEX];
md->u.index = nla_get_be32(attr); md->u.index = nla_get_be32(attr);
} else if (md->version == 2 && tb[LWTUNNEL_IP_OPT_ERSPAN_DIR] && } else {
tb[LWTUNNEL_IP_OPT_ERSPAN_HWID]) {
attr = tb[LWTUNNEL_IP_OPT_ERSPAN_DIR]; attr = tb[LWTUNNEL_IP_OPT_ERSPAN_DIR];
md->u.md2.dir = nla_get_u8(attr); md->u.md2.dir = nla_get_u8(attr);
attr = tb[LWTUNNEL_IP_OPT_ERSPAN_HWID]; attr = tb[LWTUNNEL_IP_OPT_ERSPAN_HWID];
set_hwid(&md->u.md2, nla_get_u8(attr)); set_hwid(&md->u.md2, nla_get_u8(attr));
} else {
return -EINVAL;
} }
info->key.tun_flags |= TUNNEL_ERSPAN_OPT; info->key.tun_flags |= TUNNEL_ERSPAN_OPT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment