diff options
| author | Dan Carpenter <error27@gmail.com> | 2011-07-20 00:51:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 23:47:54 +0200 |
| commit | 1511022c9aabf253253e35730a6a3b945a2a53a9 (patch) | |
| tree | 28ced3b034d24f45024bf09e2dcfedd932684c81 /net | |
| parent | vlan: move vlan_group_[gs]et_device to public header (diff) | |
| download | linux-1511022c9aabf253253e35730a6a3b945a2a53a9.tar.xz linux-1511022c9aabf253253e35730a6a3b945a2a53a9.zip | |
skbuff: fix error handling in pskb_copy()
There are two problems:
1) "n" was allocated with alloc_skb() so we should free it with
kfree_skb() instead of regular kfree().
2) We return the freed pointer instead of NULL.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index d220119f13ab..2beda824636e 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -799,7 +799,8 @@ struct sk_buff *pskb_copy(struct sk_buff *skb, gfp_t gfp_mask) if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) { if (skb_copy_ubufs(skb, gfp_mask)) { - kfree(n); + kfree_skb(n); + n = NULL; goto out; } skb_shinfo(skb)->tx_flags &= ~SKBTX_DEV_ZEROCOPY; |