diff options
| -rw-r--r-- | net/core/neighbour.c | 6 | ||||
| -rw-r--r-- | net/core/skbuff.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index e1144cb94b99..417b6d739fb7 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
| @@ -871,8 +871,7 @@ static void neigh_timer_handler(unsigned long arg) | |||
| 871 | write_unlock(&neigh->lock); | 871 | write_unlock(&neigh->lock); |
| 872 | neigh->ops->solicit(neigh, skb); | 872 | neigh->ops->solicit(neigh, skb); |
| 873 | atomic_inc(&neigh->probes); | 873 | atomic_inc(&neigh->probes); |
| 874 | if (skb) | 874 | kfree_skb(skb); |
| 875 | kfree_skb(skb); | ||
| 876 | } else { | 875 | } else { |
| 877 | out: | 876 | out: |
| 878 | write_unlock(&neigh->lock); | 877 | write_unlock(&neigh->lock); |
| @@ -908,8 +907,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) | |||
| 908 | neigh->updated = jiffies; | 907 | neigh->updated = jiffies; |
| 909 | write_unlock_bh(&neigh->lock); | 908 | write_unlock_bh(&neigh->lock); |
| 910 | 909 | ||
| 911 | if (skb) | 910 | kfree_skb(skb); |
| 912 | kfree_skb(skb); | ||
| 913 | return 1; | 911 | return 1; |
| 914 | } | 912 | } |
| 915 | } else if (neigh->nud_state & NUD_STALE) { | 913 | } else if (neigh->nud_state & NUD_STALE) { |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 33640d99c8ed..e5e2111a397d 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -1208,8 +1208,7 @@ unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta) | |||
| 1208 | insp = list; | 1208 | insp = list; |
| 1209 | } | 1209 | } |
| 1210 | if (!pskb_pull(list, eat)) { | 1210 | if (!pskb_pull(list, eat)) { |
| 1211 | if (clone) | 1211 | kfree_skb(clone); |
| 1212 | kfree_skb(clone); | ||
| 1213 | return NULL; | 1212 | return NULL; |
| 1214 | } | 1213 | } |
| 1215 | break; | 1214 | break; |
