diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2007-11-26 23:11:19 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2007-11-26 23:11:19 +0800 |
| commit | 2d4baff8da06f424a6fca10e26434c4926a7c3df (patch) | |
| tree | c0f537d5cf0aca544ba77d11b529f146f5ba5bc8 /include/linux/skbuff.h | |
| parent | [IPV4]: Fix memory leak in inet_hashtables.h when NUMA is on (diff) | |
| download | linux-dev-2d4baff8da06f424a6fca10e26434c4926a7c3df.tar.xz linux-dev-2d4baff8da06f424a6fca10e26434c4926a7c3df.zip | |
[SKBUFF]: Free old skb properly in skb_morph
The skb_morph function only freed the data part of the dst skb, but leaked
the auxiliary data such as the netfilter fields. This patch fixes this by
moving the relevant parts from __kfree_skb to skb_release_all and calling
it in skb_morph.
It also makes kfree_skbmem static since it's no longer called anywhere else
and it now no longer does skb_release_data.
Thanks to Yasuyuki KOZAKAI for finding this problem and posting a patch for
it.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 91140fe8c119..bddd50bd6878 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -356,7 +356,6 @@ static inline struct sk_buff *alloc_skb_fclone(unsigned int size, return __alloc_skb(size, priority, 1, -1); } -extern void kfree_skbmem(struct sk_buff *skb); extern struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src); extern struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t priority); |