diff options
| author |   Hangbin Liu <liuhangbin@gmail.com> | 2017-05-08 17:57:13 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-05-08 15:10:31 -0400 |
| commit | 8ed508fd4b84a38db63ddeee8ab6905f06cfa589 (patch) | |
| tree | 847d7a2f96b86ba37fb51d44ef8b7d79b8de27a6 /net | |
| parent | bpf: don't let ldimm64 leak map addresses on unprivileged (diff) | |
| download | linux-dev-8ed508fd4b84a38db63ddeee8ab6905f06cfa589.tar.xz linux-dev-8ed508fd4b84a38db63ddeee8ab6905f06cfa589.zip | |
vti: check nla_put_* return value
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_vti.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 40977413fd48..4ec9affb2252 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -546,12 +546,13 @@ static int vti_fill_info(struct sk_buff *skb, const struct net_device *dev) struct ip_tunnel *t = netdev_priv(dev); struct ip_tunnel_parm *p = &t->parms; - nla_put_u32(skb, IFLA_VTI_LINK, p->link); - nla_put_be32(skb, IFLA_VTI_IKEY, p->i_key); - nla_put_be32(skb, IFLA_VTI_OKEY, p->o_key); - nla_put_in_addr(skb, IFLA_VTI_LOCAL, p->iph.saddr); - nla_put_in_addr(skb, IFLA_VTI_REMOTE, p->iph.daddr); - nla_put_u32(skb, IFLA_VTI_FWMARK, t->fwmark); + if (nla_put_u32(skb, IFLA_VTI_LINK, p->link) || + nla_put_be32(skb, IFLA_VTI_IKEY, p->i_key) || + nla_put_be32(skb, IFLA_VTI_OKEY, p->o_key) || + nla_put_in_addr(skb, IFLA_VTI_LOCAL, p->iph.saddr) || + nla_put_in_addr(skb, IFLA_VTI_REMOTE, p->iph.daddr) || + nla_put_u32(skb, IFLA_VTI_FWMARK, t->fwmark)) + return -EMSGSIZE; return 0; } |