diff options
| author |   Miaohe Lin <linmiaohe@huawei.com> | 2020-08-15 04:46:41 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-08-18 15:56:56 -0700 |
| commit | eabe861881a733fc84f286f4d5a1ffaddd4f526f (patch) | |
| tree | c09bf44be9e0fb36d9550296db07c4f380f30320 /net | |
| parent | net: gianfar: Add of_node_put() before goto statement (diff) | |
| download | linux-dev-eabe861881a733fc84f286f4d5a1ffaddd4f526f.tar.xz linux-dev-eabe861881a733fc84f286f4d5a1ffaddd4f526f.zip | |
net: handle the return value of pskb_carve_frag_list() correctly
pskb_carve_frag_list() may return -ENOMEM in pskb_carve_inside_nonlinear().
we should handle this correctly or we would get wrong sk_buff.
Fixes: 6fa01ccd8830 ("skbuff: Add pskb_extract() helper function")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/skbuff.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 5c3b906aeef3..e18184ffa9c3 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5987,9 +5987,13 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off, if (skb_has_frag_list(skb)) skb_clone_fraglist(skb); - if (k == 0) { - /* split line is in frag list */ - pskb_carve_frag_list(skb, shinfo, off - pos, gfp_mask); + /* split line is in frag list */ + if (k == 0 && pskb_carve_frag_list(skb, shinfo, off - pos, gfp_mask)) { + /* skb_frag_unref() is not needed here as shinfo->nr_frags = 0. */ + if (skb_has_frag_list(skb)) + kfree_skb_list(skb_shinfo(skb)->frag_list); + kfree(data); + return -ENOMEM; } skb_release_data(skb); |