diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-30 17:43:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-30 17:43:56 -0400 |
| commit | 785824165508a65478474f0c87f6b8c3ad048c62 (patch) | |
| tree | 2b3ef81b4439cf682638aa504e29f37ef2b6da96 /net/ipv6 | |
| parent | ec0506dbe4e240ecd4c32bf74c84a88ce1ddb414 (diff) | |
| parent | 768b1031dc9f3eabe3e9f603e33617a0215c12a8 (diff) | |
| download | linux-3.10-785824165508a65478474f0c87f6b8c3ad048c62.tar.gz linux-3.10-785824165508a65478474f0c87f6b8c3ad048c62.tar.bz2 linux-3.10-785824165508a65478474f0c87f6b8c3ad048c62.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index 24939486328..e63c3972a73 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/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; @@ -313,7 +314,7 @@ ipq_set_verdict(struct ipq_verdict_msg *vmsg, unsigned int len) { struct nf_queue_entry *entry; - if (vmsg->value > NF_MAX_VERDICT) + if (vmsg->value > NF_MAX_VERDICT || vmsg->value == NF_STOLEN) return -EINVAL; entry = ipq_find_dequeue_entry(vmsg->id); @@ -358,12 +359,9 @@ ipq_receive_peer(struct ipq_peer_msg *pmsg, break; case IPQM_VERDICT: - if (pmsg->msg.verdict.value > NF_MAX_VERDICT) - status = -EINVAL; - else - status = ipq_set_verdict(&pmsg->msg.verdict, - len - sizeof(*pmsg)); - break; + status = ipq_set_verdict(&pmsg->msg.verdict, + len - sizeof(*pmsg)); + break; default: status = -EINVAL; } |