openvswitch: Stop using NLA_PUT*().

These macros contain a hidden goto, and are thus extremely error
prone and make code hard to audit.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 20 insertions, 14 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 2c030505b335..f5ca1257debf 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -779,15 +779,18 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
         tcp_flags = flow->tcp_flags;
         spin_unlock_bh(&flow->lock);
 
-        if (used)
-                NLA_PUT_U64(skb, OVS_FLOW_ATTR_USED, ovs_flow_used_time(used));
+        if (used &&
+            nla_put_u64(skb, OVS_FLOW_ATTR_USED, ovs_flow_used_time(used)))
+                goto nla_put_failure;
 
-        if (stats.n_packets)
-                NLA_PUT(skb, OVS_FLOW_ATTR_STATS,
-                        sizeof(struct ovs_flow_stats), &stats);
+        if (stats.n_packets &&
+            nla_put(skb, OVS_FLOW_ATTR_STATS,
+                    sizeof(struct ovs_flow_stats), &stats))
+                goto nla_put_failure;
 
-        if (tcp_flags)
-                NLA_PUT_U8(skb, OVS_FLOW_ATTR_TCP_FLAGS, tcp_flags);
+        if (tcp_flags &&
+            nla_put_u8(skb, OVS_FLOW_ATTR_TCP_FLAGS, tcp_flags))
+                goto nla_put_failure;
 
         /* If OVS_FLOW_ATTR_ACTIONS doesn't fit, skip dumping the actions if
          * this is the first flow to be dumped into 'skb'.  This is unusual for
@@ -1169,7 +1172,8 @@ static int ovs_dp_cmd_fill_info(struct datapath *dp, struct sk_buff *skb,
                 goto nla_put_failure;
 
         get_dp_stats(dp, &dp_stats);
-        NLA_PUT(skb, OVS_DP_ATTR_STATS, sizeof(struct ovs_dp_stats), &dp_stats);
+        if (nla_put(skb, OVS_DP_ATTR_STATS, sizeof(struct ovs_dp_stats), &dp_stats))
+                goto nla_put_failure;
 
         return genlmsg_end(skb, ovs_header);
 
@@ -1469,14 +1473,16 @@ static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,
 
         ovs_header->dp_ifindex = get_dpifindex(vport->dp);
 
-        NLA_PUT_U32(skb, OVS_VPORT_ATTR_PORT_NO, vport->port_no);
-        NLA_PUT_U32(skb, OVS_VPORT_ATTR_TYPE, vport->ops->type);
-        NLA_PUT_STRING(skb, OVS_VPORT_ATTR_NAME, vport->ops->get_name(vport));
-        NLA_PUT_U32(skb, OVS_VPORT_ATTR_UPCALL_PID, vport->upcall_pid);
+        if (nla_put_u32(skb, OVS_VPORT_ATTR_PORT_NO, vport->port_no) ||
+            nla_put_u32(skb, OVS_VPORT_ATTR_TYPE, vport->ops->type) ||
+            nla_put_string(skb, OVS_VPORT_ATTR_NAME, vport->ops->get_name(vport)) ||
+            nla_put_u32(skb, OVS_VPORT_ATTR_UPCALL_PID, vport->upcall_pid))
+                goto nla_put_failure;
 
         ovs_vport_get_stats(vport, &vport_stats);
-        NLA_PUT(skb, OVS_VPORT_ATTR_STATS, sizeof(struct ovs_vport_stats),
-                &vport_stats);
+        if (nla_put(skb, OVS_VPORT_ATTR_STATS, sizeof(struct ovs_vport_stats),
+                    &vport_stats))
+                goto nla_put_failure;
 
         err = ovs_vport_get_options(vport, skb);
         if (err == -EMSGSIZE)