From: John Fastabend <john.fastabend@gmail•com>
To: Eric Dumazet <eric.dumazet@gmail•com>
Cc: edumazet@google•com, vtlam@google•com, netdev@vger•kernel.org
Subject: Re: [net PATCH] net: sched: lock imbalance in hhf qdisc
Date: Thu, 01 May 2014 09:15:21 -0700 [thread overview]
Message-ID: <53627319.8010902@gmail.com> (raw)
In-Reply-To: <1398958222.29914.195.camel@edumazet-glaptop2.roam.corp.google.com>
On 05/01/2014 08:30 AM, Eric Dumazet wrote:
> 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@intel•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 ?
Sure. What you have below looks good. I'll submit an official v2 patch.
--
John Fastabend Intel Corporation
prev parent reply other threads:[~2014-05-01 16:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-01 15:15 [net PATCH] net: sched: lock imbalance in hhf qdisc John Fastabend
2014-05-01 15:30 ` Eric Dumazet
2014-05-01 16:15 ` John Fastabend [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53627319.8010902@gmail.com \
--to=john.fastabend@gmail$(echo .)com \
--cc=edumazet@google$(echo .)com \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=vtlam@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox