[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140501151542.3649.8824.stgit@nitbit.x32>
Date: Thu, 01 May 2014 08:15:44 -0700
From: John Fastabend <john.fastabend@...il.com>
To: edumazet@...gle.com, vtlam@...gle.com
Cc: netdev@...r.kernel.org
Subject: [net PATCH] net: sched: lock imbalance in hhf qdisc
hhf_change() takes the sch_tree_lock and releases it but misses the error
cases. Fix the missed case here.
Signed-off-by: John Fastabend <john.r.fastabend@...el.com>
---
net/sched/sch_hhf.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c
index edee03d..1803f89 100644
--- a/net/sched/sch_hhf.c
+++ b/net/sched/sch_hhf.c
@@ -565,8 +565,10 @@ static int hhf_change(struct Qdisc *sch, struct nlattr *opt)
new_hhf_non_hh_weight = nla_get_u32(tb[TCA_HHF_NON_HH_WEIGHT]);
non_hh_quantum = (u64)new_quantum * new_hhf_non_hh_weight;
- if (non_hh_quantum > INT_MAX)
+ if (non_hh_quantum > INT_MAX) {
+ sch_tree_unlock(sch);
return -EINVAL;
+ }
q->quantum = new_quantum;
q->hhf_non_hh_weight = new_hhf_non_hh_weight;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists