]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
vti: check nla_put_* return value
authorHangbin Liu <liuhangbin@gmail.com>
Mon, 8 May 2017 09:57:13 +0000 (17:57 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 May 2017 19:10:31 +0000 (15:10 -0400)
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_vti.c

index 40977413fd4843f304a6782286e46403bbab9d57..4ec9affb2252408b0c218ad63b17a891ff2ab8ed 100644 (file)
@@ -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;
 }