Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / sched / sch_red.c

diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c
index a5cc301..633e32d 100644 (file)
--- a/net/sched/sch_red.c
+++ b/net/sched/sch_red.c
@@ -272,8 +272,9 @@ static int red_dump(struct Qdisc *sch, struct sk_buff *skb)
        opts = nla_nest_start(skb, TCA_OPTIONS);
        if (opts == NULL)
                goto nla_put_failure;
-       NLA_PUT(skb, TCA_RED_PARMS, sizeof(opt), &opt);
-       NLA_PUT_U32(skb, TCA_RED_MAX_P, q->parms.max_P);
+       if (nla_put(skb, TCA_RED_PARMS, sizeof(opt), &opt) ||
+           nla_put_u32(skb, TCA_RED_MAX_P, q->parms.max_P))
+               goto nla_put_failure;
        return nla_nest_end(skb, opts);
 
 nla_put_failure: