From b0b3a032207bf83fff5a3dbdde27e374dd1a7263 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Fri, 29 Jul 2011 16:38:49 +0200 Subject: [PATCH] --- yaml --- r: 263925 b: refs/heads/master c: 91c66c6893a3e2bb8a88a30cb76007d5d49d32c9 h: refs/heads/master i: 263923: 5c33d19f1882bc28aaceab42f62830fa6eaa8b48 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_queue.c | 1 + trunk/net/ipv6/netfilter/ip6_queue.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 04b741e3677a..a2107abdf727 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00fe1ae91e0d69e52e8212d23cd3ecc74a7259a0 +refs/heads/master: 91c66c6893a3e2bb8a88a30cb76007d5d49d32c9 diff --git a/trunk/net/ipv4/netfilter/ip_queue.c b/trunk/net/ipv4/netfilter/ip_queue.c index 5c9b9d963918..48f7d5b4ff37 100644 --- a/trunk/net/ipv4/netfilter/ip_queue.c +++ b/trunk/net/ipv4/netfilter/ip_queue.c @@ -218,6 +218,7 @@ ipq_build_packet_message(struct nf_queue_entry *entry, int *errp) return skb; nlmsg_failure: + kfree_skb(skb); *errp = -EINVAL; printk(KERN_ERR "ip_queue: error creating packet message\n"); return NULL; diff --git a/trunk/net/ipv6/netfilter/ip6_queue.c b/trunk/net/ipv6/netfilter/ip6_queue.c index 249394863284..87b243a25afa 100644 --- a/trunk/net/ipv6/netfilter/ip6_queue.c +++ b/trunk/net/ipv6/netfilter/ip6_queue.c @@ -218,6 +218,7 @@ ipq_build_packet_message(struct nf_queue_entry *entry, int *errp) return skb; nlmsg_failure: + kfree_skb(skb); *errp = -EINVAL; printk(KERN_ERR "ip6_queue: error creating packet message\n"); return NULL;