GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 15:27:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net_sched: properly cancel netlink dump on failure

Browse source 
When nla_put*() fails after nla_nest_start(), we need
to call nla_nest_cancel() to cancel the message, otherwise
we end up calling nla_nest_end() like a success.

Fixes: 0ed5269f9e ("net/sched: add tunnel option support to act_tunnel_key")
Cc: Davide Caratti <dcaratti@redhat.com>
Cc: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Cong Wang 2018-09-06 14:50:16 -07:00 • committed by David S. Miller
parent 8edfe2e992
commit a162c35114
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
net/sched/act_tunnel_key.c
View file

@ -412,8 +412,10 @@ static int tunnel_key_geneve_opts_dump(struct sk_buff *skb,
nla_put_u8(skb, TCA_TUNNEL_KEY_ENC_OPT_GENEVE_TYPE, nla_put_u8(skb, TCA_TUNNEL_KEY_ENC_OPT_GENEVE_TYPE,
opt->type) || opt->type) ||
nla_put(skb, TCA_TUNNEL_KEY_ENC_OPT_GENEVE_DATA, nla_put(skb, TCA_TUNNEL_KEY_ENC_OPT_GENEVE_DATA,
opt->length * 4, opt + 1)) opt->length * 4, opt + 1)) {
nla_nest_cancel(skb, start);
return -EMSGSIZE; return -EMSGSIZE;
}
len -= sizeof(struct geneve_opt) + opt->length * 4; len -= sizeof(struct geneve_opt) + opt->length * 4;
src += sizeof(struct geneve_opt) + opt->length * 4; src += sizeof(struct geneve_opt) + opt->length * 4;
@ -427,7 +429,7 @@ static int tunnel_key_opts_dump(struct sk_buff *skb,
const struct ip_tunnel_info *info) const struct ip_tunnel_info *info)
{ {
struct nlattr *start; struct nlattr *start;
int err; int err = -EINVAL;
if (!info->options_len) if (!info->options_len)
return 0; return 0;
@ -439,9 +441,11 @@ static int tunnel_key_opts_dump(struct sk_buff *skb,
if (info->key.tun_flags & TUNNEL_GENEVE_OPT) { if (info->key.tun_flags & TUNNEL_GENEVE_OPT) {
err = tunnel_key_geneve_opts_dump(skb, info); err = tunnel_key_geneve_opts_dump(skb, info);
if (err) if (err)
return err; goto err_out;
} else { } else {
return -EINVAL; err_out:
nla_nest_cancel(skb, start);
return err;
} }
nla_nest_end(skb, start); nla_nest_end(skb, start);