From: Di Zhu <zhudi2@huawei.com>
To: <jhs@mojatatu.com>, <xiyou.wangcong@gmail.com>,
<jiri@resnulli.us>, <davem@davemloft.net>, <edumazet@google.com>,
<kuba@kernel.org>, <pabeni@redhat.com>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<zhudi2@huawei.com>, <rose.chen@huawei.com>,
<syzbot+7a12909485b94426aceb@syzkaller.appspotmail.com>
Subject: [PATCH] fq_codel: Discard problematic packets with pkt_len 0
Date: Fri, 10 Jun 2022 15:05:29 +0800 [thread overview]
Message-ID: <20220610070529.1623-1-zhudi2@huawei.com> (raw)
Syzbot found an issue [1]: fq_codel_drop() try to drop a flow whitout any
skbs, that is, the flow->head is null.
The root cause is that: when the first queued skb with pkt_len 0, backlogs
of the flow that this skb enqueued is still 0 and if sch->limit is set to
0 then fq_codel_drop() will be called. At this point, the backlogs of all
flows are all 0, so flow with idx 0 is selected to drop, but this flow have
not any skbs.
skb with pkt_len 0 can break existing processing logic, so just discard
these invalid skbs.
LINK: [1] https://syzkaller.appspot.com/bug?id=0b84da80c2917757915afa89f7738a9d16ec96c5
Reported-by: syzbot+7a12909485b94426aceb@syzkaller.appspotmail.com
Signed-off-by: Di Zhu <zhudi2@huawei.com>
---
net/sched/sch_fq_codel.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
index 839e1235db05..c0f82b7358e1 100644
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
@@ -191,6 +191,9 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch,
unsigned int pkt_len;
bool memory_limited;
+ if (unlikely(!qdisc_pkt_len(skb)))
+ return qdisc_drop(skb, sch, to_free);
+
idx = fq_codel_classify(skb, sch, &ret);
if (idx == 0) {
if (ret & __NET_XMIT_BYPASS)
--
2.27.0
next reply other threads:[~2022-06-10 7:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-10 7:05 Di Zhu [this message]
2022-06-10 7:32 ` Eric Dumazet
2022-06-10 7:35 ` Eric Dumazet
2022-06-10 7:37 ` 答复: " zhudi (E)
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=20220610070529.1623-1-zhudi2@huawei.com \
--to=zhudi2@huawei.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rose.chen@huawei.com \
--cc=syzbot+7a12909485b94426aceb@syzkaller.appspotmail.com \
--cc=xiyou.wangcong@gmail.com \
/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
all inboxes | Powered by JetHome®