netdev - Re: [PATCH] net/sched: unregister root_lock_key in the error path of qdisc

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 linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Fri, 17 May 2024 09:17:04 +0800
From: Hou Tao <houtao@...weicloud.com>
To: Davide Caratti <dcaratti@...hat.com>
Cc: netdev@...r.kernel.org, Jamal Hadi Salim <jhs@...atatu.com>,
 Cong Wang <xiyou.wangcong@...il.com>, Jiri Pirko <jiri@...nulli.us>,
 "David S . Miller" <davem@...emloft.net>, Eric Dumazet
 <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>, bpf@...r.kernel.org
Subject: Re: [PATCH] net/sched: unregister root_lock_key in the error path of
 qdisc_alloc()

H Davide,

On 5/16/2024 9:45 PM, Davide Caratti wrote:
> hello Hou Tao,
>
> On Thu, May 16, 2024 at 3:33 PM Hou Tao <houtao@...weicloud.com> wrote:
>> Oops. Forgot to add the target git tree for the patch. It is targeted
>> for net- tree.
>>
>>> diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
>>> index 31dfd6c7405b0..d3f6006b563cc 100644
>>> --- a/net/sched/sch_generic.c
>>> +++ b/net/sched/sch_generic.c
>>> @@ -982,6 +982,7 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
>>>
>>>       return sch;
>>>  errout1:
>>> +     lockdep_unregister_key(&sch->root_lock_key);
>>>       kfree(sch);
>>>  errout:
>>>       return ERR_PTR(err);
> AFAIS this line is part of the fix that was merged a couple of weeks
> ago, (see the 2nd hunk of [1]). That patch also protects the error
> path of qdisc_create(), that proved to make kselftest fail with
> similar splats. Can you check if this commit resolves that syzbot?

I missed that commit and didn't check the net-next git tree before
posting the patch. Yes, I think this commit will resolve the reported
problem. Thanks.
>
> thanks a lot!