netfilter fixes for net
Subsystems (3)
Pablo Neira Ayuso
maintainercover netfilter fixes for net
Hi David,
The following patchset contains two Netfilter fixes for your net tree, they are:
* Fix endianness in nft_reject, the NFTA_REJECT_TYPE netlink attributes was not converted to network byte order as needed by all nfnetlink subsystems, from Eric Leblond.
* Restrict SYNPROXY target to INPUT and FORWARD chains, this avoid a possible crash due to misconfigurations, from Patrick McHardy.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master
Thanks!
----------------------------------------------------------------
The following changes since commit 8afdd99a1315e759de04ad6e2344f0c5f17ecb1b:
udp: ipv4: fix an use after free in __udp4_lib_rcv() (2013-12-10 22:58:40 -0500)
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 a3adadf3018102c24754e0b53a5515c40fbaff4a:
netfilter: nft_reject: fix endianness in dump function (2013-12-12 09:37:39 +0100)
----------------------------------------------------------------
Eric Leblond (1):
netfilter: nft_reject: fix endianness in dump function
Patrick McHardy (1):
netfilter: SYNPROXY target: restrict to INPUT/FORWARD
net/ipv4/netfilter/ipt_SYNPROXY.c | 1 + net/ipv4/netfilter/nft_reject_ipv4.c | 2 +- net/ipv6/netfilter/ip6t_SYNPROXY.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
Eric Leblond (1):
netfilter: nft_reject: fix endianness in dump function
Patrick McHardy (1):
netfilter: SYNPROXY target: restrict to INPUT/FORWARD
net/ipv4/netfilter/ipt_SYNPROXY.c | 1 + net/ipv4/netfilter/nft_reject_ipv4.c | 2 +- net/ipv6/netfilter/ip6t_SYNPROXY.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 1/2 netfilter: SYNPROXY target: restrict to INPUT/FORWARD
From: Patrick McHardy <[email protected]>
Fix a crash in synproxy_send_tcp() when using the SYNPROXY target in the PREROUTING chain caused by missing routing information.
--- net/ipv4/netfilter/ipt_SYNPROXY.c | 1 + net/ipv6/netfilter/ip6t_SYNPROXY.c | 1 + 2 files changed, 2 insertions(+)
net/ipv4/netfilter/ipt_SYNPROXY.c +1 -0
@@ -423,6 +423,7 @@ static void synproxy_tg4_destroy(const struct xt_tgdtor_param *par)static struct xt_target synproxy_tg4_reg__read_mostly = { .name ="SYNPROXY" , .family =NFPROTO_IPV4 , + .hooks = (1 <<NF_INET_LOCAL_IN ) | (1 <<NF_INET_FORWARD ), .target = synproxy_tg4, .targetsize =sizeof (struct xt_synproxy_info ), .checkentry = synproxy_tg4_check,
net/ipv6/netfilter/ip6t_SYNPROXY.c +1 -0
@@ -446,6 +446,7 @@ static void synproxy_tg6_destroy(const struct xt_tgdtor_param *par)static struct xt_target synproxy_tg6_reg__read_mostly = { .name ="SYNPROXY" , .family =NFPROTO_IPV6 , + .hooks = (1 <<NF_INET_LOCAL_IN ) | (1 <<NF_INET_FORWARD ), .target = synproxy_tg6, .targetsize =sizeof (struct xt_synproxy_info ), .checkentry = synproxy_tg6_check,
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 2/2 netfilter: nft_reject: fix endianness in dump function
In reply to Pablo Neira AyusoFrom: Eric Leblond <[email protected]>
The dump function in nft_reject_ipv4 was not converting a u32 field to network order before sending it to userspace, this needs to happen for consistency with other nf_tables and nfnetlink subsystems.
--- net/ipv4/netfilter/nft_reject_ipv4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/netfilter/nft_reject_ipv4.c +1 -1
@@ -72,7 +72,7 @@ static int nft_reject_dump(struct sk_buff *skb, const struct nft_expr *expr) {const struct nft_reject *priv =nft_expr_priv (expr); -if (nla_put_be32 (skb,NFTA_REJECT_TYPE , priv->type)) +if (nla_put_be32 (skb,NFTA_REJECT_TYPE ,htonl (priv->type))) goto nla_put_failure;switch (priv->type) {
Signature · 1 line
1.7.10.4
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Fri, 13 Dec 2013 19:24:57 +0100
Quoted 7 lines
The following patchset contains two Netfilter fixes for your net tree, they are:
* Fix endianness in
nft_reject, theNFTA_REJECT_TYPEnetlink attributes was not converted to network byte order as needed by all nfnetlink subsystems, from Eric Leblond.
Quoted 6 lines
* Restrict SYNPROXY target to INPUT and FORWARD chains, this avoid a possible crash due to misconfigurations, from Patrick McHardy.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.gitmaster
Pulled, thanks Pablo.