gro: check returned skb of napi_frags_skb() against NULL
Subsystems (2)
PATCH 1/1 gro: check returned skb of napi_frags_skb() against NULL
Some rogue network adapter and their driver pass bad skbs to GRO. napi_frags_skb() detects this, drops these bad skbs, and return NULL to napi_gro_frags(), which does not check returned skb against NULL and access it. This results in a kernel crash.
A better approach to address these bad skbs would be to issue some warnings and drop them, which napi_frags_skb() already does, and move on without crashing the kernel.
--- net/core/gro.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/gro.c +3 -0
@@ -731,6 +731,9 @@ gro_result_t napi_gro_frags(struct napi_struct *napi)gro_result_t ret;struct sk_buff *skb =napi_frags_skb (napi); +if (unlikely (!skb)) +return GRO_CONSUMED ; +trace_napi_gro_frags_entry (skb); ret =napi_frags_finish (napi, skb,dev_gro_receive (napi, skb));
Signature · 1 line
2.34.1
Quoted 10 lines · Kaiyu Zhang
Some rogue network adapter and their driver pass bad skbs to GRO.
napi_frags_skb()detects this, drops these bad skbs, and return NULL tonapi_gro_frags(), which does not check returned skb against NULL and access it. This results in a kernel crash.A better approach to address these bad skbs would be to issue some warnings and drop them, which
napi_frags_skb()already does, and move on without crashing the kernel.
Certainly not.
We are not going to try to be nice to buggy drivers.
Please fix the "rogue network adapter" instead.
A message that is not in the archive (sent off-list or not yet received): CAJfyFi3OEz2Dz9gopigkVJRa4qCToJ+ob952O_qkOFiNn08LwA@mail.gmail.com
Quoted 6 lines · Kaiyu Zhang
Yes the network adapter needs to be fixed for passing invalid packets to GRO. And a message like "dropping impossible skb" should be indicative enough for developers to do so.
And yet I propose this patch because an immediate system crash caused by NULL pointer access after the above warning message is a bit more difficult to analyse on some test bed where developers have to restore kernel messages after a reboot .
Furthermore, the adapter I'm working with is capable of receiving very small packets (1 or 2 bytes). They insist this is a feature rather than a bug. I can, and I will check packet length before passing them to GRO, for this particular adapter. But maybe a non-crash warning in general might be helpful to other developers who will face the same problem and spare them some effort on debugging.
1 or 2 bytes would still be stored in an skb, right ?
GRO is already very slow, we do not want to make it even slower so that some developers can save time.
A kernel crash would point to the NULL deref just fine.
If we continue this path, we will soon add "if (!skb) be_kind" to all functions accepting an skb as a parameter,
then everything else...