diff options
author | David S. Miller <davem@davemloft.net> | 2015-02-20 22:36:20 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-20 22:36:20 (GMT) |
commit | ee92259849b1616e4c23121f78eb1342d2b1ce1e (patch) | |
tree | 3f9b59862131aeee98552048d8ac67be0ede6cf8 /net/netfilter/ipvs/ip_vs_ctl.c | |
parent | 278f7b4fffce9ad267406cf8800df271d14f4a16 (diff) | |
parent | 78296c97ca1fd3b104f12e1f1fbc06c46635990b (diff) | |
download | linux-ee92259849b1616e4c23121f78eb1342d2b1ce1e.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter/IPVS fixes for net
The following patchset contains updates for your net tree, they are:
1) Fix removal of destination in IPVS when the new mixed family support
is used, from Alexey Andriyanov via Simon Horman.
2) Fix module refcount undeflow in nft_compat when reusing a match /
target.
3) Fix iptables-restore when the recent match is used with a new hitcount
that exceeds threshold, from Florian Westphal.
4) Fix stack corruption in xt_socket due to using stack storage to save
the inner IPv6 header, from Eric Dumazet.
I'll follow up soon with another batch with more fixes that are still
cooking.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_ctl.c')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index e557590..ed99448 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -3402,7 +3402,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info) if (udest.af == 0) udest.af = svc->af; - if (udest.af != svc->af) { + if (udest.af != svc->af && cmd != IPVS_CMD_DEL_DEST) { /* The synchronization protocol is incompatible * with mixed family services */ |