netdev - Re: [RFC PATCH 15/17] net: sched: pfifo_fast use skb

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]

Message-ID: <ff039560-3945-7341-15b7-2ed9e21545c0@gmail.com>
Date:   Wed, 15 Nov 2017 06:57:40 -0800
From:   John Fastabend <john.fastabend@...il.com>
To:     Willem de Bruijn <willemdebruijn.kernel@...il.com>
Cc:     Daniel Borkmann <daniel@...earbox.net>,
        Eric Dumazet <eric.dumazet@...il.com>, make0818@...il.com,
        Network Development <netdev@...r.kernel.org>,
        Jiří Pírko <jiri@...nulli.us>,
        Cong Wang <xiyou.wangcong@...il.com>
Subject: Re: [RFC PATCH 15/17] net: sched: pfifo_fast use skb_array

[...]

>>  static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
>> @@ -685,17 +688,40 @@ static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
>>
>>  static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
>>  {
>> -       int prio;
>> +       unsigned int qlen = qdisc_dev(qdisc)->tx_queue_len;
>>         struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
>> +       int prio;
>> +
>> +       /* guard against zero length rings */
>> +       if (!qlen)
>> +               return -EINVAL;
>>
>> -       for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
>> -               qdisc_skb_head_init(band2list(priv, prio));
>> +       for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
>> +               struct skb_array *q = band2list(priv, prio);
>> +               int err;
>> +
>> +               err = skb_array_init(q, qlen, GFP_KERNEL);
>> +               if (err)
>> +                       return -ENOMEM;
> 
> This relies on the caller calling ops->destroy on error to free partially
> allocated state. For uninitialized bands, that calls spin_lock on an
> uninitialized spinlock from skb_array_cleanup -> ptr_ring_cleanup ->
> ptr_ring_consume.

Nice catch will fix in next version. And also make above suggested
changes.

Thanks,
John.