aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-02-27 12:57:37 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-28 12:42:14 -0500
commitb08d5840d2c5a6ac0bce172f4c861974d718e34b (patch)
tree8f9423bc255d312269065623fcb136fc661b8bc1
parent4498121ca3acbf928681b71261227d28dc29b6f6 (diff)
[NET]: Fix kfree(skb)
Signed-off-by: Patrick McHardy <kaber@trash.net> Acked-by: Paul Moore <paul.moore@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/skbuff.c2
-rw-r--r--net/dccp/output.c2
-rw-r--r--net/netlabel/netlabel_unlabeled.c2
-rw-r--r--net/xfrm/xfrm_user.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index f89ff151cfab..820761f9eeef 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2037,7 +2037,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)
2037err: 2037err:
2038 while ((skb = segs)) { 2038 while ((skb = segs)) {
2039 segs = skb->next; 2039 segs = skb->next;
2040 kfree(skb); 2040 kfree_skb(skb);
2041 } 2041 }
2042 return ERR_PTR(err); 2042 return ERR_PTR(err);
2043} 2043}
diff --git a/net/dccp/output.c b/net/dccp/output.c
index f5c6aca1dfa4..3282f2f2291b 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -269,7 +269,7 @@ void dccp_write_xmit(struct sock *sk, int block)
269 err); 269 err);
270 } else { 270 } else {
271 dccp_pr_debug("packet discarded\n"); 271 dccp_pr_debug("packet discarded\n");
272 kfree(skb); 272 kfree_skb(skb);
273 } 273 }
274 } 274 }
275} 275}
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 5bc37181662e..b931edee4b8b 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -173,7 +173,7 @@ static int netlbl_unlabel_list(struct sk_buff *skb, struct genl_info *info)
173 return 0; 173 return 0;
174 174
175list_failure: 175list_failure:
176 kfree(ans_skb); 176 kfree_skb(ans_skb);
177 return ret_val; 177 return ret_val;
178} 178}
179 179
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 924a2fefcd94..956cfe0ff7f8 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1401,7 +1401,7 @@ static int xfrm_get_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
1401 1401
1402 x = xfrm_state_lookup(&id->daddr, id->spi, id->proto, id->family); 1402 x = xfrm_state_lookup(&id->daddr, id->spi, id->proto, id->family);
1403 if (x == NULL) { 1403 if (x == NULL) {
1404 kfree(r_skb); 1404 kfree_skb(r_skb);
1405 return -ESRCH; 1405 return -ESRCH;
1406 } 1406 }
1407 1407