From: Nguyen Dinh Phi <phind.uet@gmail.com>
To: davem@davemloft.net, kuba@kernel.org, ast@kernel.org,
daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com,
andrii@kernel.org, kafai@fb.com, songliubraving@fb.com,
yhs@fb.com, kpsingh@kernel.org, edumazet@google.com,
atenart@kernel.org, alobakin@pm.me, weiwan@google.com,
ap420073@gmail.com, bjorn@kernel.org, memxor@gmail.com
Cc: netdev@vger.kernel.org,
syzbot+989efe781c74de1ddb54@syzkaller.appspotmail.com,
linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
linux-kernel-mentees@lists.linuxfoundation.org
Subject: [PATCH] net: drop skbs in napi->rx_list when removing the napi context.
Date: Thu, 12 Aug 2021 07:59:59 +0800 [thread overview]
Message-ID: <20210811235959.1099333-1-phind.uet@gmail.com> (raw)
The napi->rx_list is used to hold the GRO_NORMAL skbs before passing
them to the stack, these skbs only passed to stack at the flush time or
when the list's weight matches the predefined condition. In case the
rx_list contains pending skbs when we remove the napi context, we need
to clean out this list, otherwise, a memory leak will happen.
Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com>
Reported-by: syzbot+989efe781c74de1ddb54@syzkaller.appspotmail.com
---
net/core/dev.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/core/dev.c b/net/core/dev.c
index b51e41d0a7fe..319fffc62ce6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7038,6 +7038,13 @@ void __netif_napi_del(struct napi_struct *napi)
list_del_rcu(&napi->dev_list);
napi_free_frags(napi);
+ if (napi->rx_count) {
+ struct sk_buff *skb, *n;
+
+ list_for_each_entry_safe(skb, n, &napi->rx_list, list)
+ kfree_skb(skb);
+ }
+
flush_gro_hash(napi);
napi->gro_bitmask = 0;
--
2.25.1
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next reply other threads:[~2021-08-12 0:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-11 23:59 Nguyen Dinh Phi [this message]
2021-08-12 4:50 ` [PATCH] net: drop skbs in napi->rx_list when removing the napi context Hillf Danton
2021-08-12 5:19 ` [syzbot] memory leak in packet_sendmsg syzbot
2021-08-12 7:07 ` [PATCH] net: drop skbs in napi->rx_list when removing the napi context Eric Dumazet via Linux-kernel-mentees
2021-08-12 19:17 ` Phi Nguyen
2021-08-13 10:16 ` Eric Dumazet
2021-08-13 10:51 ` Nguyen Dinh Phi
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=20210811235959.1099333-1-phind.uet@gmail.com \
--to=phind.uet@gmail.com \
--cc=alobakin@pm.me \
--cc=andrii@kernel.org \
--cc=ap420073@gmail.com \
--cc=ast@kernel.org \
--cc=atenart@kernel.org \
--cc=bjorn@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=memxor@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=syzbot+989efe781c74de1ddb54@syzkaller.appspotmail.com \
--cc=weiwan@google.com \
--cc=yhs@fb.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;
as well as URLs for NNTP newsgroup(s).