|
@@ -479,24 +479,28 @@ static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt,
|
|
|
q->cparams.mtu = psched_mtu(qdisc_dev(sch));
|
|
|
|
|
|
if (opt) {
|
|
|
- int err = fq_codel_change(sch, opt, extack);
|
|
|
+ err = fq_codel_change(sch, opt, extack);
|
|
|
if (err)
|
|
|
- return err;
|
|
|
+ goto init_failure;
|
|
|
}
|
|
|
|
|
|
err = tcf_block_get(&q->block, &q->filter_list, sch, extack);
|
|
|
if (err)
|
|
|
- return err;
|
|
|
+ goto init_failure;
|
|
|
|
|
|
if (!q->flows) {
|
|
|
q->flows = kvcalloc(q->flows_cnt,
|
|
|
sizeof(struct fq_codel_flow),
|
|
|
GFP_KERNEL);
|
|
|
- if (!q->flows)
|
|
|
- return -ENOMEM;
|
|
|
+ if (!q->flows) {
|
|
|
+ err = -ENOMEM;
|
|
|
+ goto init_failure;
|
|
|
+ }
|
|
|
q->backlogs = kvcalloc(q->flows_cnt, sizeof(u32), GFP_KERNEL);
|
|
|
- if (!q->backlogs)
|
|
|
- return -ENOMEM;
|
|
|
+ if (!q->backlogs) {
|
|
|
+ err = -ENOMEM;
|
|
|
+ goto alloc_failure;
|
|
|
+ }
|
|
|
for (i = 0; i < q->flows_cnt; i++) {
|
|
|
struct fq_codel_flow *flow = q->flows + i;
|
|
|
|
|
@@ -509,6 +513,13 @@ static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt,
|
|
|
else
|
|
|
sch->flags &= ~TCQ_F_CAN_BYPASS;
|
|
|
return 0;
|
|
|
+
|
|
|
+alloc_failure:
|
|
|
+ kvfree(q->flows);
|
|
|
+ q->flows = NULL;
|
|
|
+init_failure:
|
|
|
+ q->flows_cnt = 0;
|
|
|
+ return err;
|
|
|
}
|
|
|
|
|
|
static int fq_codel_dump(struct Qdisc *sch, struct sk_buff *skb)
|