From: Yang Yingliang <yangyingliang@huawei.com>
To: Nikolay Aleksandrov <razor@blackwall.org>,
<linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>
Cc: <den@openvz.org>, <davem@davemloft.net>, <edumazet@google.com>,
<kuba@kernel.org>
Subject: Re: [PATCH net v2] net: neigh: don't call kfree_skb() under spin_lock_irqsave()
Date: Mon, 22 Aug 2022 09:39:21 +0800 [thread overview]
Message-ID: <eb7a4bac-965e-c68d-da34-22921fd94141@huawei.com> (raw)
In-Reply-To: <c9bc0382-fd0d-c596-5f61-365a8e0cbb21@blackwall.org>
Hi,
On 2022/8/19 20:15, Nikolay Aleksandrov wrote:
> On 19/08/2022 07:47, Yang Yingliang wrote:
>> It is not allowed to call kfree_skb() from hardware interrupt
>> context or with interrupts being disabled. So add all skb to
>> a tmp list, then free them after spin_unlock_irqrestore() at
>> once.
>>
>> Fixes: 66ba215cb513 ("neigh: fix possible DoS due to net iface start/stop loop")
>> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
>> ---
>> net/core/neighbour.c | 10 +++++++++-
>> 1 file changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/net/core/neighbour.c b/net/core/neighbour.c
>> index 5b669eb80270..d21c7de1ff1a 100644
>> --- a/net/core/neighbour.c
>> +++ b/net/core/neighbour.c
>> @@ -309,14 +309,17 @@ static int neigh_del_timer(struct neighbour *n)
>>
>> static void pneigh_queue_purge(struct sk_buff_head *list, struct net *net)
>> {
>> + struct sk_buff_head tmp;
>> unsigned long flags;
>> struct sk_buff *skb;
>>
>> + skb_queue_head_init(&tmp);
>> spin_lock_irqsave(&list->lock, flags);
>> skb = skb_peek(list);
>> while (skb != NULL) {
>> struct sk_buff *skb_next = skb_peek_next(skb, list);
>> struct net_device *dev = skb->dev;
>> +
>> if (net == NULL || net_eq(dev_net(dev), net)) {
>> struct in_device *in_dev;
>>
>> @@ -328,11 +331,16 @@ static void :q
> (struct sk_buff_head *list, struct net *net)
>> __skb_unlink(skb, list);
>>
>> dev_put(dev);
>> - kfree_skb(skb);
>> + dev_kfree_skb_irq(skb);
> this is still doing dev_kfree_skb_irq() instead of attaching the skb to tmp, in fact
> tmp seems unused so the loop below does nothing
>
>> }
>> skb = skb_next;
>> }
>> spin_unlock_irqrestore(&list->lock, flags);
>> +
>> + while ((skb = __skb_dequeue(&tmp))) {
>> + dev_put(skb->dev);
> Also note that there's already a dev_put() above
I made a mistake and send a wrong patch, please ignore this patch.
Thanks,
Yang
>
>> + kfree_skb(skb);
>> + }
>> }
>>
>> static void neigh_flush_dev(struct neigh_table *tbl, struct net_device *dev,
>
> .
prev parent reply other threads:[~2022-08-22 1:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-19 4:47 [PATCH net v2] net: neigh: don't call kfree_skb() under spin_lock_irqsave() Yang Yingliang
2022-08-19 7:56 ` Denis V. Lunev
2022-08-19 12:15 ` Nikolay Aleksandrov
2022-08-22 1:39 ` Yang Yingliang [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=eb7a4bac-965e-c68d-da34-22921fd94141@huawei.com \
--to=yangyingliang@huawei.com \
--cc=davem@davemloft.net \
--cc=den@openvz.org \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=razor@blackwall.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).