diff options
| author |   Eric Dumazet <edumazet@google.com> | 2015-11-19 12:11:23 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-11-20 16:43:14 -0500 |
| commit | e2f9dc3bd213792ac006e83f50a5453f23b8c354 (patch) | |
| tree | 7c97168cccbbfbe77d52ce0c083fc3dff0d075c7 /net/core/dev.c | |
| parent | ravb: use clock rate as basis for GTI.TIV (diff) | |
| download | linux-dev-e2f9dc3bd213792ac006e83f50a5453f23b8c354.tar.xz linux-dev-e2f9dc3bd213792ac006e83f50a5453f23b8c354.zip | |
net: avoid NULL deref in napi_get_frags()
napi_alloc_skb() can return NULL.
We should not crash should this happen.
Fixes: 93f93a440415 ("net: move skb_mark_napi_id() into core networking stack")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 41cef3e3f558..5df6cbce727c 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4390,8 +4390,10 @@ struct sk_buff *napi_get_frags(struct napi_struct *napi) if (!skb) { skb = napi_alloc_skb(napi, GRO_MAX_HEAD); - napi->skb = skb; - skb_mark_napi_id(skb, napi); + if (skb) { + napi->skb = skb; + skb_mark_napi_id(skb, napi); + } } return skb; } |