lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 01 May 2014 08:30:22 -0700 From: Eric Dumazet <eric.dumazet@...il.com> To: John Fastabend <john.fastabend@...il.com> Cc: edumazet@...gle.com, vtlam@...gle.com, netdev@...r.kernel.org Subject: Re: [net PATCH] net: sched: lock imbalance in hhf qdisc On Thu, 2014-05-01 at 08:15 -0700, John Fastabend wrote: > 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; > Good catch, could you refactor a bit more to do all checks before any change ? diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c index edee03d922e2..6e957c3b9854 100644 --- a/net/sched/sch_hhf.c +++ b/net/sched/sch_hhf.c @@ -553,11 +553,6 @@ static int hhf_change(struct Qdisc *sch, struct nlattr *opt) if (err < 0) return err; - sch_tree_lock(sch); - - if (tb[TCA_HHF_BACKLOG_LIMIT]) - sch->limit = nla_get_u32(tb[TCA_HHF_BACKLOG_LIMIT]); - if (tb[TCA_HHF_QUANTUM]) new_quantum = nla_get_u32(tb[TCA_HHF_QUANTUM]); @@ -567,6 +562,12 @@ static int hhf_change(struct Qdisc *sch, struct nlattr *opt) non_hh_quantum = (u64)new_quantum * new_hhf_non_hh_weight; if (non_hh_quantum > INT_MAX) return -EINVAL; + + sch_tree_lock(sch); + + if (tb[TCA_HHF_BACKLOG_LIMIT]) + sch->limit = nla_get_u32(tb[TCA_HHF_BACKLOG_LIMIT]); + 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