Netfilter/IPVS fixes for net
Subsystems (4)
Pablo Neira Ayuso
maintainercover Netfilter/IPVS fixes for net
Hi David,
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.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks!
----------------------------------------------------------------
The following changes since commit 42b5212fee4f57907e9415b18fe19c13e65574bc:
xen-netback: stop the guest rx thread after a fatal error (2015-02-02 19:39:04 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master
for you to fetch changes up to 78296c97ca1fd3b104f12e1f1fbc06c46635990b:
netfilter: xt_socket: fix a stack corruption bug (2015-02-16 17:00:48 +0100)
----------------------------------------------------------------
Alexey Andriyanov (1):
ipvs: fix inability to remove a mixed-family RS
Eric Dumazet (1):
netfilter: xt_socket: fix a stack corruption bug
Florian Westphal (1):
netfilter: xt_recent: don't reject rule if new hitcount exceeds table max
Pablo Neira Ayuso (1):
netfilter: nft_compat: fix module refcount underflow
net/netfilter/ipvs/ip_vs_ctl.c | 2 +- net/netfilter/nft_compat.c | 12 ++++++++++-- net/netfilter/xt_recent.c | 11 +++++------ net/netfilter/xt_socket.c | 21 ++++++++++++--------- 4 files changed, 28 insertions(+), 18 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/4 ipvs: fix inability to remove a mixed-family RS
From: Alexey Andriyanov <[email protected]>
The current code prevents any operation with a mixed-family dest unless IP_VS_CONN_F_TUNNEL flag is set. The problem is that it's impossible for the client to follow this rule, because ip_vs_genl_parse_dest does not even read the destination conn_flags when cmd = IPVS_CMD_DEL_DEST (need_full_dest = 0).
Also, not every client can pass this flag when removing a dest. ipvsadm, for example, does not support the "-i" command line option together with the "-d" option.
This change disables any checks for mixed-family on IPVS_CMD_DEL_DEST command.
--- net/netfilter/ipvs/ip_vs_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipvs/ip_vs_ctl.c +1 -1
@@ -3399,7 +3399,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 */
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 2/4 netfilter: nft_compat: fix module refcount underflow
In reply to Pablo Neira AyusoFeb 12 18:20:42 nfdev kernel: ------------[ cut here ]------------ Feb 12 18:20:42 nfdev kernel: WARNING: CPU: 4 PID: 4359 at kernel/module.c:963 module_put+0x9b/0xba() Feb 12 18:20:42 nfdev kernel: CPU: 4 PID: 4359 Comm: ebtables-compat Tainted: G W 3.19.0-rc6+ #43 [...] Feb 12 18:20:42 nfdev kernel: Call Trace: Feb 12 18:20:42 nfdev kernel: [<ffffffff815fd911>] dump_stack+0x4c/0x65 Feb 12 18:20:42 nfdev kernel: [<ffffffff8103e6f7>] warn_slowpath_common+0x9c/0xb6 Feb 12 18:20:42 nfdev kernel: [<ffffffff8109919f>] ? module_put+0x9b/0xba Feb 12 18:20:42 nfdev kernel: [<ffffffff8103e726>] warn_slowpath_null+0x15/0x17 Feb 12 18:20:42 nfdev kernel: [<ffffffff8109919f>] module_put+0x9b/0xba Feb 12 18:20:42 nfdev kernel: [<ffffffff813ecf7c>] nft_match_destroy+0x45/0x4c Feb 12 18:20:42 nfdev kernel: [<ffffffff813e683f>] nf_tables_rule_destroy+0x28/0x70
--- net/netfilter/nft_compat.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/netfilter/nft_compat.c +10 -2
@@ -578,8 +578,12 @@ nft_match_select_ops(const struct nft_ctx *ctx,struct xt_match *match = nft_match->ops.data;if (strcmp (match->name, mt_name) ==0 && - match->revision == rev && match->family == family) + match->revision == rev && match->family == family) { +if (!try_module_get (match->me)) +return ERR_PTR (-ENOENT ); +return &nft_match->ops; + } } match =xt_request_find_match (family, mt_name, rev);
@@ -648,8 +652,12 @@ nft_target_select_ops(const struct nft_ctx *ctx,struct xt_target *target = nft_target->ops.data;if (strcmp (target->name, tg_name) ==0 && - target->revision == rev && target->family == family) + target->revision == rev && target->family == family) { +if (!try_module_get (target->me)) +return ERR_PTR (-ENOENT ); +return &nft_target->ops; + } } target =xt_request_find_target (family, tg_name, rev);
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 3/4 netfilter: xt_recent: don't reject rule if new hitcount exceeds table max
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
given:
-A INPUT -m recent --update --seconds 30 --hitcount 4 and
iptables-save > foo
then
iptables-restore < foo
will fail with:
kernel: xt_recent: hitcount (4) is larger than packets to be remembered (4) for table DEFAULT
Even when the check is fixed, the restore won't work if the hitcount is increased to e.g. 6, since by the time checkentry runs it will find the 'old' incarnation of the table.
We can avoid this by increasing the maximum threshold silently; we only have to rm all the current entries of the table (these entries would not have enough room to handle the increased hitcount).
This even makes (not-very-useful)
-A INPUT -m recent --update --seconds 30 --hitcount 4 -A INPUT -m recent --update --seconds 30 --hitcount 42 work.
--- net/netfilter/xt_recent.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
net/netfilter/xt_recent.c +5 -6
@@ -378,12 +378,11 @@ static int recent_mt_check(const struct xt_mtchk_param *par,mutex_lock (&recent_mutex); t =recent_table_lookup (recent_net, info->name);if (t !=NULL ) { -if (info->hit_count > t->nstamps_max_mask) { -pr_info ("hitcount (%u) is larger than packets to be remembered (%u) for table %s\n" , - info->hit_count, t->nstamps_max_mask +1 , - info->name); - ret = -EINVAL ; - goto out; +if (nstamp_mask > t->nstamps_max_mask) { +spin_lock_bh (&recent_lock); +recent_table_flush (t); + t->nstamps_max_mask = nstamp_mask; +spin_unlock_bh (&recent_lock); } t->refcnt++;
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 4/4 netfilter: xt_socket: fix a stack corruption bug
In reply to Pablo Neira AyusoFrom: Eric Dumazet <[email protected]>
As soon as extract_icmp6_fields() returns, its local storage (automatic variables) is deallocated and can be overwritten.
Lets add an additional parameter to make sure storage is valid long enough.
While we are at it, adds some const qualifiers.
--- net/netfilter/xt_socket.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
net/netfilter/xt_socket.c +12 -9
@@ -243,12 +243,13 @@ static int extract_icmp6_fields(const struct sk_buff *skb, unsigned int outside_hdrlen, int *protocol, - struct in6_addr **raddr, - struct in6_addr **laddr, + const struct in6_addr **raddr, + const struct in6_addr **laddr, __be16 *rport, - __be16 *lport) + __be16 *lport, + struct ipv6hdr *ipv6_var) { - struct ipv6hdr *inside_iph, _inside_iph; + const struct ipv6hdr *inside_iph;struct icmp6hdr *icmph, _icmph;__be16 *ports, _ports[2 ];u8 inside_nexthdr;
@@ -263,12 +264,14 @@ extract_icmp6_fields(const struct sk_buff *skb,if (icmph->icmp6_type &ICMPV6_INFOMSG_MASK )return 1 ; - inside_iph =skb_header_pointer (skb, outside_hdrlen +sizeof (_icmph),sizeof (_inside_iph), &_inside_iph); + inside_iph =skb_header_pointer (skb, outside_hdrlen +sizeof (_icmph), +sizeof (*ipv6_var), ipv6_var);if (inside_iph ==NULL )return 1 ; inside_nexthdr = inside_iph->nexthdr; - inside_hdrlen =ipv6_skip_exthdr (skb, outside_hdrlen +sizeof (_icmph) +sizeof (_inside_iph), + inside_hdrlen =ipv6_skip_exthdr (skb, outside_hdrlen +sizeof (_icmph) + +sizeof (*ipv6_var), &inside_nexthdr, &inside_fragoff);if (inside_hdrlen <0 )return 1 ;/* hjm: Packet has no/incomplete transport layer headers. */
@@ -315,10 +318,10 @@ xt_socket_get_sock_v6(struct net *net, const u8 protocol,static bool socket_mt6_v1_v2 (const struct sk_buff *skb,struct xt_action_param *par) { -struct ipv6hdr *iph =ipv6_hdr (skb); +struct ipv6hdr ipv6_var, *iph =ipv6_hdr (skb);struct udphdr _hdr, *hp =NULL ;struct sock *sk = skb->sk; -struct in6_addr *daddr =NULL , *saddr =NULL ; +const struct in6_addr *daddr =NULL , *saddr =NULL ;__be16 uninitialized_var (dport ),uninitialized_var (sport );int thoff =0 ,uninitialized_var (tproto );const struct xt_socket_mtinfo1 *info = (struct xt_socket_mtinfo1 *) par->matchinfo;
@@ -342,7 +345,7 @@ socket_mt6_v1_v2(const struct sk_buff *skb, struct xt_action_param *par) }else if (tproto ==IPPROTO_ICMPV6 ) {if (extract_icmp6_fields (skb, thoff, &tproto, &saddr, &daddr, - &sport, &dport)) + &sport, &dport, &ipv6_var))return false; }else {return false;
Signature · 1 line
1.7.10.4
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Thu, 19 Feb 2015 19:19:16 +0100
Quoted 8 lines
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_compatwhen reusing a match / target.
Quoted 8 lines
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_socketdue 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.
Pulled, thanks Pablo.