diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-13 18:24:31 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-13 18:24:31 (GMT) |
| commit | b0e61d98c672a9216d72d2d7430f6dc60795002e (patch) | |
| tree | e3df3834c08ce75b63aa1f21ac31e483f273495b /net/netfilter/nfnetlink_queue_core.c | |
| parent | 280050cc81ccb2e06e4061228ee34c0cc86b1560 (diff) | |
| parent | c7cbb9173d3c6d41cbfbca451902d66fe6440cbb (diff) | |
| download | linux-b0e61d98c672a9216d72d2d7430f6dc60795002e.tar.xz | |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Pablo Neira Ayuso says:
====================
The following patchset contains four Netfilter updates, mostly targeting
to fix issues added with IPv6 NAT, and one little IPVS update for net-next:
* Remove unneeded conditional free of skb in nfnetlink_queue, from
Wei Yongjun.
* One semantic path from coccinelle detected the use of list_del +
INIT_LIST_HEAD, instead of list_del_init, again from Wei Yongjun.
* Fix out-of-bound memory access in the NAT address selection, from
Florian Westphal. This was introduced with the IPv6 NAT patches.
* Two fixes for crashes that were introduced in the recently merged
IPv6 NAT support, from myself.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nfnetlink_queue_core.c')
| -rw-r--r-- | net/netfilter/nfnetlink_queue_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c index b8d9995..43de3a0 100644 --- a/net/netfilter/nfnetlink_queue_core.c +++ b/net/netfilter/nfnetlink_queue_core.c @@ -406,8 +406,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue, return skb; nla_put_failure: - if (skb) - kfree_skb(skb); + kfree_skb(skb); net_err_ratelimited("nf_queue: error creating packet message\n"); return NULL; } |