1 files changed, 21 insertions, 14 deletions

diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 1d8bd0dbcd1f..ccd08c8dc6a7 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -572,25 +572,32 @@ static int flow_dump(struct tcf_proto *tp, unsigned long fh,
         if (nest == NULL)
                 goto nla_put_failure;
 
-        NLA_PUT_U32(skb, TCA_FLOW_KEYS, f->keymask);
-        NLA_PUT_U32(skb, TCA_FLOW_MODE, f->mode);
+        if (nla_put_u32(skb, TCA_FLOW_KEYS, f->keymask) ||
+            nla_put_u32(skb, TCA_FLOW_MODE, f->mode))
+                goto nla_put_failure;
 
         if (f->mask != ~0 || f->xor != 0) {
-                NLA_PUT_U32(skb, TCA_FLOW_MASK, f->mask);
-                NLA_PUT_U32(skb, TCA_FLOW_XOR, f->xor);
+                if (nla_put_u32(skb, TCA_FLOW_MASK, f->mask) ||
+                    nla_put_u32(skb, TCA_FLOW_XOR, f->xor))
+                        goto nla_put_failure;
         }
-        if (f->rshift)
-                NLA_PUT_U32(skb, TCA_FLOW_RSHIFT, f->rshift);
-        if (f->addend)
-                NLA_PUT_U32(skb, TCA_FLOW_ADDEND, f->addend);
+        if (f->rshift &&
+            nla_put_u32(skb, TCA_FLOW_RSHIFT, f->rshift))
+                goto nla_put_failure;
+        if (f->addend &&
+            nla_put_u32(skb, TCA_FLOW_ADDEND, f->addend))
+                goto nla_put_failure;
 
-        if (f->divisor)
-                NLA_PUT_U32(skb, TCA_FLOW_DIVISOR, f->divisor);
-        if (f->baseclass)
-                NLA_PUT_U32(skb, TCA_FLOW_BASECLASS, f->baseclass);
+        if (f->divisor &&
+            nla_put_u32(skb, TCA_FLOW_DIVISOR, f->divisor))
+                goto nla_put_failure;
+        if (f->baseclass &&
+            nla_put_u32(skb, TCA_FLOW_BASECLASS, f->baseclass))
+                goto nla_put_failure;
 
-        if (f->perturb_period)
-                NLA_PUT_U32(skb, TCA_FLOW_PERTURB, f->perturb_period / HZ);
+        if (f->perturb_period &&
+            nla_put_u32(skb, TCA_FLOW_PERTURB, f->perturb_period / HZ))
+                goto nla_put_failure;
 
         if (tcf_exts_dump(skb, &f->exts, &flow_ext_map) < 0)
                 goto nla_put_failure;