Netfilter fixes for net
Subsystems (4)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Fix a deadlock when module is requested via netlink_bind() in nfnetlink, from Florian Westphal.
2) Fix ipt_rpfilter and ip6t_rpfilter with VRF, from Miaohe Lin.
3) Skip master comparison in SIP helper to fix expectation clash under two valid scenarios, from xiao ruizhu.
4) Remove obsolete comments in nf_conntrack codebase, from Yonatan Goldschmidt.
5) Fix redirect extension module autoload, from Christian Hesse.
6) Fix incorrect mssg option sent to client in synproxy, from Fernando Fernandez.
7) Fix incorrect window calculations in TCP conntrack, from Florian Westphal.
8) Don't bail out when updating basechain policy due to recent offload works, also from Florian.
9) Allow symhash to use modulus 1 as other hash extensions do, from Laura.Garcia.
10) Missing NAT chain module autoload for the inet family, from Phil Sutter.
11) Fix missing adjustment of TCP RST packet in synproxy, from Fernando Fernandez.
12) Skip EAGAIN path when nft_meta_bridge is built-in or not selected.
13) Conntrack bridge does not depend on nf_tables_bridge.
14) Turn NF_TABLES_BRIDGE into tristate to fix possible link break of nft_meta_bridge, from Arnd Bergmann.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks.
----------------------------------------------------------------
The following changes since commit 76104862cccaeaa84fdd23e39f2610a96296291c:
sky2: Disable MSI on P5W DH Deluxe (2019-07-14 13:45:54 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to dfee0e99bcff718fa14d973c41f161220fdcb7d5:
netfilter: bridge: make NF_TABLES_BRIDGE tristate (2019-07-19 18:08:14 +0200)
----------------------------------------------------------------
Arnd Bergmann (1):
netfilter: bridge: make NF_TABLES_BRIDGE tristate
Christian Hesse (1):
netfilter: nf_tables: fix module autoload for redir
Fernando Fernandez Mancera (2):
netfilter: synproxy: fix erroneous tcp mss option
netfilter: synproxy: fix rst sequence number mismatch
Florian Westphal (3):
netfilter: nfnetlink: avoid deadlock due to synchronous request_module
netfilter: conntrack: always store window size un-scaled
netfilter: nf_tables: don't fail when updating base chain policy
Laura Garcia Liebana (1):
netfilter: nft_hash: fix symhash with modulus one
Miaohe Lin (1):
netfilter: Fix rpfilter dropping vrf packets by mistake
Pablo Neira Ayuso (2):
netfilter: nft_meta: skip EAGAIN if nft_meta_bridge is not a module
netfilter: bridge: NF_CONNTRACK_BRIDGE does not depend on NF_TABLES_BRIDGE
Phil Sutter (1):
netfilter: nf_tables: Support auto-loading for inet nat
Yonatan Goldschmidt (1):
netfilter: Update obsolete comments referring to ip_conntrack
xiao ruizhu (1):
netfilter: nf_conntrack_sip: fix expectation clash
include/linux/netfilter/nf_conntrack_h323_asn1.h | 3 +-- include/net/netfilter/nf_conntrack_expect.h | 12 ++++++++--- include/net/netfilter/nf_conntrack_synproxy.h | 1 + net/bridge/netfilter/Kconfig | 6 +++--- net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 ++-- net/ipv4/netfilter/ipt_SYNPROXY.c | 2 ++ net/ipv4/netfilter/ipt_rpfilter.c | 1 + net/ipv4/netfilter/nf_nat_h323.c | 12 +++++------ net/ipv6/netfilter/ip6t_SYNPROXY.c | 2 ++ net/ipv6/netfilter/ip6t_rpfilter.c | 8 ++++++-- net/netfilter/Kconfig | 6 ++---- net/netfilter/ipvs/ip_vs_nfct.c | 2 +- net/netfilter/nf_conntrack_amanda.c | 2 +- net/netfilter/nf_conntrack_broadcast.c | 2 +- net/netfilter/nf_conntrack_core.c | 4 +--- net/netfilter/nf_conntrack_expect.c | 26 +++++++++++++++++------- net/netfilter/nf_conntrack_ftp.c | 2 +- net/netfilter/nf_conntrack_h323_asn1.c | 5 ++--- net/netfilter/nf_conntrack_h323_main.c | 18 ++++++++-------- net/netfilter/nf_conntrack_irc.c | 2 +- net/netfilter/nf_conntrack_netlink.c | 4 ++-- net/netfilter/nf_conntrack_pptp.c | 4 ++-- net/netfilter/nf_conntrack_proto_gre.c | 2 -- net/netfilter/nf_conntrack_proto_icmp.c | 2 +- net/netfilter/nf_conntrack_proto_tcp.c | 8 +++++--- net/netfilter/nf_conntrack_sane.c | 2 +- net/netfilter/nf_conntrack_sip.c | 10 ++++++--- net/netfilter/nf_conntrack_tftp.c | 2 +- net/netfilter/nf_nat_amanda.c | 2 +- net/netfilter/nf_nat_core.c | 2 +- net/netfilter/nf_nat_ftp.c | 2 +- net/netfilter/nf_nat_irc.c | 2 +- net/netfilter/nf_nat_sip.c | 8 +++++--- net/netfilter/nf_nat_tftp.c | 2 +- net/netfilter/nf_synproxy_core.c | 8 ++++---- net/netfilter/nf_tables_api.c | 2 ++ net/netfilter/nfnetlink.c | 2 +- net/netfilter/nft_chain_filter.c | 2 +- net/netfilter/nft_chain_nat.c | 3 +++ net/netfilter/nft_ct.c | 2 +- net/netfilter/nft_hash.c | 2 +- net/netfilter/nft_meta.c | 2 +- net/netfilter/nft_redir.c | 2 +- net/netfilter/nft_synproxy.c | 2 ++ 44 files changed, 117 insertions(+), 82 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/14 netfilter: nfnetlink: avoid deadlock due to synchronous request_module
From: Florian Westphal <[email protected]>
Thomas and Juliana report a deadlock when running:
(rmmod nf_conntrack_netlink/xfrm_user)
conntrack -e NEW -E &
modprobe -v xfrm_user
They provided following analysis:
conntrack -e NEW -E
netlink_bind()
netlink_lock_table() -> increases "nl_table_users"
nfnetlink_bind()
# does not unlock the table as it's locked by netlink_bind()
__request_module()
call_usermodehelper_exec()This triggers "modprobe nf_conntrack_netlink" from kernel, netlink_bind() won't return until modprobe process is done.
"modprobe xfrm_user":
xfrm_user_init()
register_pernet_subsys()
-> grab pernet_ops_rwsem
..
netlink_table_grab()
calls schedule() as "nl_table_users" is non-zeroso modprobe is blocked because netlink_bind() increased nl_table_users while also holding pernet_ops_rwsem.
"modprobe nf_conntrack_netlink" runs and inits nf_conntrack_netlink:
ctnetlink_init()
register_pernet_subsys()
-> blocks on "pernet_ops_rwsem" thanks to xfrm_user moduleboth modprobe processes wait on one another -- neither can make progress.
Switch netlink_bind() to "nowait" modprobe -- this releases the netlink table lock, which then allows both modprobe instances to complete.
--- net/netfilter/nfnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nfnetlink.c +1 -1
@@ -578,7 +578,7 @@ static int nfnetlink_bind(struct net *net, int group) ss =nfnetlink_get_subsys (type <<8 );rcu_read_unlock ();if (!ss) -request_module ("nfnetlink-subsys-%d" , type); +request_module_nowait ("nfnetlink-subsys-%d" , type); return 0; }#endif
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/14 netfilter: Fix rpfilter dropping vrf packets by mistake
In reply to Pablo Neira AyusoFrom: Miaohe Lin <[email protected]>
When firewalld is enabled with ipv4/ipv6 rpfilter, vrf ipv4/ipv6 packets will be dropped. Vrf device will pass through netfilter hook twice. One with enslaved device and another one with l3 master device. So in device may dismatch witch out device because out device is always enslaved device.So failed with the check of the rpfilter and drop the packets by mistake.
--- net/ipv4/netfilter/ipt_rpfilter.c | 1 + net/ipv6/netfilter/ip6t_rpfilter.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
net/ipv4/netfilter/ipt_rpfilter.c +1 -0
@@ -78,6 +78,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par) flow.flowi4_mark = info->flags &XT_RPFILTER_VALID_MARK ? skb->mark :0 ; flow.flowi4_tos =RT_TOS (iph->tos); flow.flowi4_scope =RT_SCOPE_UNIVERSE ; + flow.flowi4_oif =l3mdev_master_ifindex_rcu (xt_in (par));return rpfilter_lookup_reverse (xt_net (par), &flow,xt_in (par), info->flags) ^ invert; }
net/ipv6/netfilter/ip6t_rpfilter.c +6 -2
@@ -55,7 +55,9 @@ static bool rpfilter_lookup_reverse6(struct net *net, const struct sk_buff *skb,if (rpfilter_addr_linklocal (&iph->saddr)) { lookup_flags |=RT6_LOOKUP_F_IFACE ; fl6.flowi6_oif = dev->ifindex; - }else if ((flags &XT_RPFILTER_LOOSE ) ==0 ) +/* Set flowi6_oif for vrf devices to lookup route in l3mdev domain. */ + }else if (netif_is_l3_master (dev) ||netif_is_l3_slave (dev) || + (flags &XT_RPFILTER_LOOSE ) ==0 ) fl6.flowi6_oif = dev->ifindex; rt = (void *)ip6_route_lookup (net, &fl6, skb, lookup_flags);
@@ -70,7 +72,9 @@ static bool rpfilter_lookup_reverse6(struct net *net, const struct sk_buff *skb, goto out; } -if (rt->rt6i_idev->dev == dev || (flags &XT_RPFILTER_LOOSE )) +if (rt->rt6i_idev->dev == dev || +l3mdev_master_ifindex_rcu (rt->rt6i_idev->dev) == dev->ifindex || + (flags &XT_RPFILTER_LOOSE )) ret = true; out:ip6_rt_put (rt);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/14 netfilter: nf_conntrack_sip: fix expectation clash
In reply to Pablo Neira AyusoFrom: xiao ruizhu <[email protected]>
When conntracks change during a dialog, SDP messages may be sent from different conntracks to establish expects with identical tuples. In this case expects conflict may be detected for the 2nd SDP message and end up with a process failure.
The fixing here is to reuse an existing expect who has the same tuple for a different conntrack if any.
Here are two scenarios for the case.
1)
SERVER CPE
| INVITE SDP |
5060 |<----------------------|5060
| 100 Trying |
5060 |---------------------->|5060
| 183 SDP |
5060 |---------------------->|5060 ===> Conntrack 1
| PRACK |
50601 |<----------------------|5060
| 200 OK (PRACK) |
50601 |---------------------->|5060
| 200 OK (INVITE) |
5060 |---------------------->|5060
| ACK |
50601 |<----------------------|5060
| |
|<--- RTP stream ------>|
| |
| INVITE SDP (t38) |
50601 |---------------------->|5060 ===> Conntrack 2With a certain configuration in the CPE, SIP messages "183 with SDP" and "re-INVITE with SDP t38" will go through the sip helper to create expects for RTP and RTCP.
It is okay to create RTP and RTCP expects for "183", whose master connection source port is 5060, and destination port is 5060.
In the "183" message, port in Contact header changes to 50601 (from the original 5060). So the following requests e.g. PRACK and ACK are sent to port 50601. It is a different conntrack (let call Conntrack 2) from the original INVITE (let call Conntrack 1) due to the port difference.
In this example, after the call is established, there is RTP stream but no RTCP stream for Conntrack 1, so the RTP expect created upon "183" is cleared, and RTCP expect created for Conntrack 1 retains.
When "re-INVITE with SDP t38" arrives to create RTP&RTCP expects, current ALG implementation will call nf_ct_expect_related() for RTP and RTCP. The expects tuples are identical to those for Conntrack 1. RTP expect for Conntrack 2 succeeds in creation as the one for Conntrack 1 has been removed. RTCP expect for Conntrack 2 fails in creation because it has idential tuples and 'conflict' with the one retained for Conntrack 1. And then result in a failure in processing of the re-INVITE.
2)
SERVER A CPE
| REGISTER |
5060 |<------------------| 5060 ==> CT1
| 200 |
5060 |------------------>| 5060
| |
| INVITE SDP(1) |
5060 |<------------------| 5060
| 300(multi choice) |
5060 |------------------>| 5060 SERVER B
| ACK |
5060 |<------------------| 5060
| INVITE SDP(2) |
5060 |-------------------->| 5060 ==> CT2
| 100 |
5060 |<--------------------| 5060
| 200(contact changes)|
5060 |<--------------------| 5060
| ACK |
5060 |-------------------->| 50601 ==> CT3
| |
|<--- RTP stream ---->|
| |
| BYE |
5060 |<--------------------| 50601
| 200 |
5060 |-------------------->| 50601
| INVITE SDP(3) |
5060 |<------------------| 5060 ==> CT1CPE sends an INVITE request(1) to Server A, and creates a RTP&RTCP expect pair for this Conntrack 1 (CT1). Server A responds 300 to redirect to Server B. The RTP&RTCP expect pairs created on CT1 are removed upon 300 response.
CPE sends the INVITE request(2) to Server B, and creates an expect pair for the new conntrack (due to destination address difference), let call CT2. Server B changes the port to 50601 in 200 OK response, and the following requests ACK and BYE from CPE are sent to 50601. The call is established. There is RTP stream and no RTCP stream. So RTP expect is removed and RTCP expect for CT2 retains.
As BYE request is sent from port 50601, it is another conntrack, let call CT3, different from CT2 due to the port difference. So the BYE request will not remove the RTCP expect for CT2.
Then another outgoing call is made, with the same RTP port being used (not definitely but possibly). CPE firstly sends the INVITE request(3) to Server A, and tries to create a RTP&RTCP expect pairs for this CT1. In current ALG implementation, the RTCP expect for CT1 fails in creation because it 'conflicts' with the residual one for CT2. As a result the INVITE request fails to send.
--- include/net/netfilter/nf_conntrack_expect.h | 12 +++++++++--- net/ipv4/netfilter/nf_nat_h323.c | 12 ++++++------ net/netfilter/ipvs/ip_vs_nfct.c | 2 +- net/netfilter/nf_conntrack_amanda.c | 2 +- net/netfilter/nf_conntrack_broadcast.c | 2 +- net/netfilter/nf_conntrack_expect.c | 26 +++++++++++++++++++------- net/netfilter/nf_conntrack_ftp.c | 2 +- net/netfilter/nf_conntrack_h323_main.c | 18 +++++++++--------- net/netfilter/nf_conntrack_irc.c | 2 +- net/netfilter/nf_conntrack_netlink.c | 4 ++-- net/netfilter/nf_conntrack_pptp.c | 4 ++-- net/netfilter/nf_conntrack_sane.c | 2 +- net/netfilter/nf_conntrack_sip.c | 10 +++++++--- net/netfilter/nf_conntrack_tftp.c | 2 +- net/netfilter/nf_nat_amanda.c | 2 +- net/netfilter/nf_nat_ftp.c | 2 +- net/netfilter/nf_nat_irc.c | 2 +- net/netfilter/nf_nat_sip.c | 8 +++++--- net/netfilter/nf_nat_tftp.c | 2 +- net/netfilter/nft_ct.c | 2 +- 20 files changed, 71 insertions(+), 47 deletions(-)
include/net/netfilter/nf_conntrack_expect.h +9 -3
@@ -76,6 +76,11 @@ struct nf_conntrack_expect_policy {#define NF_CT_EXPECT_CLASS_DEFAULT 0#define NF_CT_EXPECT_MAX_CNT 255 +/* Allow to reuse expectations with the same tuples from different master +* conntracks. +*/ +#define NF_CT_EXP_F_SKIP_MASTER 0x1 +int nf_conntrack_expect_pernet_init (struct net *net);void nf_conntrack_expect_pernet_fini (struct net *net);
@@ -122,10 +127,11 @@ void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, u_int8_t, u_int8_t, const __be16 *, const __be16 *);void nf_ct_expect_put (struct nf_conntrack_expect *exp);int nf_ct_expect_related_report (struct nf_conntrack_expect *expect, -u32 portid,int report); -static inline int nf_ct_expect_related (struct nf_conntrack_expect *expect) +u32 portid,int report,unsigned int flags); +static inline int nf_ct_expect_related (struct nf_conntrack_expect *expect, +unsigned int flags) { -return nf_ct_expect_related_report (expect,0 ,0 ); +return nf_ct_expect_related_report (expect,0 ,0 , flags); }#endif /*_NF_CONNTRACK_EXPECT_H*/
net/ipv4/netfilter/nf_nat_h323.c +6 -6
@@ -221,11 +221,11 @@ static int nat_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct,int ret; rtp_exp->tuple.dst.u.udp.port =htons (nated_port); - ret =nf_ct_expect_related (rtp_exp); + ret =nf_ct_expect_related (rtp_exp,0 );if (ret ==0 ) { rtcp_exp->tuple.dst.u.udp.port =htons (nated_port +1 ); - ret =nf_ct_expect_related (rtcp_exp); + ret =nf_ct_expect_related (rtcp_exp,0 );if (ret ==0 )break ;else if (ret == -EBUSY ) {
@@ -296,7 +296,7 @@ static int nat_t120(struct sk_buff *skb, struct nf_conn *ct,int ret; exp->tuple.dst.u.tcp.port =htons (nated_port); - ret =nf_ct_expect_related (exp); + ret =nf_ct_expect_related (exp,0 );if (ret ==0 )break ;else if (ret != -EBUSY ) {
@@ -352,7 +352,7 @@ static int nat_h245(struct sk_buff *skb, struct nf_conn *ct,int ret; exp->tuple.dst.u.tcp.port =htons (nated_port); - ret =nf_ct_expect_related (exp); + ret =nf_ct_expect_related (exp,0 );if (ret ==0 )break ;else if (ret != -EBUSY ) {
@@ -444,7 +444,7 @@ static int nat_q931(struct sk_buff *skb, struct nf_conn *ct,int ret; exp->tuple.dst.u.tcp.port =htons (nated_port); - ret =nf_ct_expect_related (exp); + ret =nf_ct_expect_related (exp,0 );if (ret ==0 )break ;else if (ret != -EBUSY ) {
@@ -537,7 +537,7 @@ static int nat_callforwarding(struct sk_buff *skb, struct nf_conn *ct,int ret; exp->tuple.dst.u.tcp.port =htons (nated_port); - ret =nf_ct_expect_related (exp); + ret =nf_ct_expect_related (exp,0 );if (ret ==0 )break ;else if (ret != -EBUSY ) {
net/netfilter/ipvs/ip_vs_nfct.c +1 -1
@@ -231,7 +231,7 @@ void ip_vs_nfct_expect_related(struct sk_buff *skb, struct nf_conn *ct,IP_VS_DBG_BUF (7 ,"%s: ct=%p, expect tuple=" FMT_TUPLE "\n" , __func__, ct,ARG_TUPLE (&exp->tuple)); -nf_ct_expect_related (exp); +nf_ct_expect_related (exp,0 );nf_ct_expect_put (exp); }EXPORT_SYMBOL (ip_vs_nfct_expect_related);
net/netfilter/nf_conntrack_amanda.c +1 -1
@@ -159,7 +159,7 @@ static int amanda_help(struct sk_buff *skb,if (nf_nat_amanda && ct->status &IPS_NAT_MASK ) ret =nf_nat_amanda (skb, ctinfo, protoff, off - dataoff, len, exp); -else if (nf_ct_expect_related (exp) !=0 ) { +else if (nf_ct_expect_related (exp,0 ) !=0 ) {nf_ct_helper_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; }
net/netfilter/nf_conntrack_broadcast.c +1 -1
@@ -68,7 +68,7 @@ int nf_conntrack_broadcast_help(struct sk_buff *skb, exp->class =NF_CT_EXPECT_CLASS_DEFAULT ; exp->helper =NULL ; -nf_ct_expect_related (exp); +nf_ct_expect_related (exp,0 );nf_ct_expect_put (exp);nf_ct_refresh (ct, skb, timeout *HZ );
net/netfilter/nf_conntrack_expect.c +19 -7
@@ -249,13 +249,22 @@ static inline int expect_clash(const struct nf_conntrack_expect *a,static inline int expect_matches (const struct nf_conntrack_expect *a,const struct nf_conntrack_expect *b) { -return a->master == b->master && -nf_ct_tuple_equal (&a->tuple, &b->tuple) && +return nf_ct_tuple_equal (&a->tuple, &b->tuple) &&nf_ct_tuple_mask_equal (&a->mask, &b->mask) &&net_eq (nf_ct_net (a->master),nf_ct_net (b->master)) &&nf_ct_zone_equal_any (a->master,nf_ct_zone (b->master)); } +static bool master_matches (const struct nf_conntrack_expect *a, +const struct nf_conntrack_expect *b, +unsigned int flags) +{ +if (flags &NF_CT_EXP_F_SKIP_MASTER ) +return true; + +return a->master == b->master; +} +/* Generally a bad idea to call this: could have matched already. */ void nf_ct_unexpect_related (struct nf_conntrack_expect *exp) {
@@ -399,7 +408,8 @@ static void evict_oldest_expect(struct nf_conn *master,nf_ct_remove_expect (last); } -static inline int __nf_ct_expect_check (struct nf_conntrack_expect *expect) +static inline int __nf_ct_expect_check (struct nf_conntrack_expect *expect, +unsigned int flags) {const struct nf_conntrack_expect_policy *p;struct nf_conntrack_expect *i;
@@ -417,8 +427,10 @@ static inline int __nf_ct_expect_check(struct nf_conntrack_expect *expect) } h =nf_ct_expect_dst_hash (net, &expect->tuple);hlist_for_each_entry_safe (i, next, &nf_ct_expect_hash[h], hnode) { -if (expect_matches (i, expect)) { -if (i->class != expect->class) +if (master_matches (i, expect, flags) && +expect_matches (i, expect)) { +if (i->class != expect->class || + i->master != expect->master)return -EALREADY ;if (nf_ct_remove_expect (i))
@@ -453,12 +465,12 @@ static inline int __nf_ct_expect_check(struct nf_conntrack_expect *expect) }int nf_ct_expect_related_report (struct nf_conntrack_expect *expect, -u32 portid,int report) +u32 portid,int report,unsigned int flags) {int ret;spin_lock_bh (&nf_conntrack_expect_lock); - ret =__nf_ct_expect_check (expect); + ret =__nf_ct_expect_check (expect, flags);if (ret <0 ) goto out;
net/netfilter/nf_conntrack_ftp.c +1 -1
@@ -525,7 +525,7 @@ static int help(struct sk_buff *skb, protoff, matchoff, matchlen, exp); else {/* Can't expect this? Best to drop packet now. */ -if (nf_ct_expect_related (exp) !=0 ) { +if (nf_ct_expect_related (exp,0 ) !=0 ) {nf_ct_helper_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; }else
net/netfilter/nf_conntrack_h323_main.c +9 -9
@@ -305,8 +305,8 @@ static int expect_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct, ret =nat_rtp_rtcp (skb, ct, ctinfo, protoff, data, dataoff, taddr, port, rtp_port, rtp_exp, rtcp_exp); }else {/* Conntrack only */ -if (nf_ct_expect_related (rtp_exp) ==0 ) { -if (nf_ct_expect_related (rtcp_exp) ==0 ) { +if (nf_ct_expect_related (rtp_exp,0 ) ==0 ) { +if (nf_ct_expect_related (rtcp_exp,0 ) ==0 ) {pr_debug ("nf_ct_h323: expect RTP " );nf_ct_dump_tuple (&rtp_exp->tuple);pr_debug ("nf_ct_h323: expect RTCP " );
@@ -364,7 +364,7 @@ static int expect_t120(struct sk_buff *skb, ret =nat_t120 (skb, ct, ctinfo, protoff, data, dataoff, taddr, port, exp); }else {/* Conntrack only */ -if (nf_ct_expect_related (exp) ==0 ) { +if (nf_ct_expect_related (exp,0 ) ==0 ) {pr_debug ("nf_ct_h323: expect T.120 " );nf_ct_dump_tuple (&exp->tuple); }else
@@ -701,7 +701,7 @@ static int expect_h245(struct sk_buff *skb, struct nf_conn *ct, ret =nat_h245 (skb, ct, ctinfo, protoff, data, dataoff, taddr, port, exp); }else {/* Conntrack only */ -if (nf_ct_expect_related (exp) ==0 ) { +if (nf_ct_expect_related (exp,0 ) ==0 ) {pr_debug ("nf_ct_q931: expect H.245 " );nf_ct_dump_tuple (&exp->tuple); }else
@@ -825,7 +825,7 @@ static int expect_callforwarding(struct sk_buff *skb, protoff, data, dataoff, taddr, port, exp); }else {/* Conntrack only */ -if (nf_ct_expect_related (exp) ==0 ) { +if (nf_ct_expect_related (exp,0 ) ==0 ) {pr_debug ("nf_ct_q931: expect Call Forwarding " );nf_ct_dump_tuple (&exp->tuple); }else
@@ -1284,7 +1284,7 @@ static int expect_q931(struct sk_buff *skb, struct nf_conn *ct, ret =nat_q931 (skb, ct, ctinfo, protoff, data, taddr, i, port, exp); }else {/* Conntrack only */ -if (nf_ct_expect_related (exp) ==0 ) { +if (nf_ct_expect_related (exp,0 ) ==0 ) {pr_debug ("nf_ct_ras: expect Q.931 " );nf_ct_dump_tuple (&exp->tuple);
@@ -1349,7 +1349,7 @@ static int process_gcf(struct sk_buff *skb, struct nf_conn *ct, IPPROTO_UDP, NULL, &port); exp->helper = nf_conntrack_helper_ras; -if (nf_ct_expect_related (exp) ==0 ) { +if (nf_ct_expect_related (exp,0 ) ==0 ) {pr_debug ("nf_ct_ras: expect RAS " );nf_ct_dump_tuple (&exp->tuple); }else
@@ -1561,7 +1561,7 @@ static int process_acf(struct sk_buff *skb, struct nf_conn *ct, exp->flags =NF_CT_EXPECT_PERMANENT ; exp->helper = nf_conntrack_helper_q931; -if (nf_ct_expect_related (exp) ==0 ) { +if (nf_ct_expect_related (exp,0 ) ==0 ) {pr_debug ("nf_ct_ras: expect Q.931 " );nf_ct_dump_tuple (&exp->tuple); }else
@@ -1615,7 +1615,7 @@ static int process_lcf(struct sk_buff *skb, struct nf_conn *ct, exp->flags =NF_CT_EXPECT_PERMANENT ; exp->helper = nf_conntrack_helper_q931; -if (nf_ct_expect_related (exp) ==0 ) { +if (nf_ct_expect_related (exp,0 ) ==0 ) {pr_debug ("nf_ct_ras: expect Q.931 " );nf_ct_dump_tuple (&exp->tuple); }else
net/netfilter/nf_conntrack_irc.c +1 -1
@@ -213,7 +213,7 @@ static int help(struct sk_buff *skb, unsigned int protoff, addr_beg_p - ib_ptr, addr_end_p - addr_beg_p, exp); - else if (nf_ct_expect_related(exp) != 0) { + else if (nf_ct_expect_related(exp, 0) != 0) { nf_ct_helper_log(skb, ct, "cannot add expectation"); ret = NF_DROP;
net/netfilter/nf_conntrack_netlink.c +2 -2
@@ -2616,7 +2616,7 @@ ctnetlink_glue_attach_expect(const struct nlattr *attr, struct nf_conn *ct,if (IS_ERR (exp))return PTR_ERR (exp); - err =nf_ct_expect_related_report (exp, portid, report); + err =nf_ct_expect_related_report (exp, portid, report,0 );nf_ct_expect_put (exp);return err; }
@@ -3367,7 +3367,7 @@ ctnetlink_create_expect(struct net *net, goto err_rcu; } - err =nf_ct_expect_related_report (exp, portid, report); + err =nf_ct_expect_related_report (exp, portid, report,0 );nf_ct_expect_put (exp); err_rcu:rcu_read_unlock ();
net/netfilter/nf_conntrack_pptp.c +2 -2
@@ -234,9 +234,9 @@ static int exp_gre(struct nf_conn *ct, __be16 callid, __be16 peer_callid) nf_nat_pptp_exp_gre =rcu_dereference (nf_nat_pptp_hook_exp_gre);if (nf_nat_pptp_exp_gre && ct->status &IPS_NAT_MASK )nf_nat_pptp_exp_gre (exp_orig, exp_reply); -if (nf_ct_expect_related (exp_orig) !=0 ) +if (nf_ct_expect_related (exp_orig,0 ) !=0 ) goto out_put_both; -if (nf_ct_expect_related (exp_reply) !=0 ) +if (nf_ct_expect_related (exp_reply,0 ) !=0 ) goto out_unexpect_orig;/* Add GRE keymap entries */
net/netfilter/nf_conntrack_sane.c +1 -1
@@ -153,7 +153,7 @@ static int help(struct sk_buff *skb,nf_ct_dump_tuple (&exp->tuple);/* Can't expect this? Best to drop packet now. */ -if (nf_ct_expect_related (exp) !=0 ) { +if (nf_ct_expect_related (exp,0 ) !=0 ) {nf_ct_helper_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; }
net/netfilter/nf_conntrack_sip.c +7 -3
@@ -977,11 +977,15 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb, unsigned int protoff,/* -EALREADY handling works around end-points that send * SDP messages with identical port but different media type, * we pretend expectation was set up. +* It also works in the case that SDP messages are sent with +* identical expect tuples but for different master conntracks. */ -int errp =nf_ct_expect_related (rtp_exp); +int errp =nf_ct_expect_related (rtp_exp, +NF_CT_EXP_F_SKIP_MASTER );if (errp ==0 || errp == -EALREADY ) { -int errcp =nf_ct_expect_related (rtcp_exp); +int errcp =nf_ct_expect_related (rtcp_exp, +NF_CT_EXP_F_SKIP_MASTER );if (errcp ==0 || errcp == -EALREADY ) ret =NF_ACCEPT ;
@@ -1296,7 +1300,7 @@ static int process_register_request(struct sk_buff *skb, unsigned int protoff, ret = hooks->expect (skb, protoff, dataoff, dptr, datalen, exp, matchoff, matchlen); else { -if (nf_ct_expect_related (exp) !=0 ) { +if (nf_ct_expect_related (exp,0 ) !=0 ) {nf_ct_helper_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; }else
net/netfilter/nf_conntrack_tftp.c +1 -1
@@ -78,7 +78,7 @@ static int tftp_help(struct sk_buff *skb, nf_nat_tftp =rcu_dereference (nf_nat_tftp_hook);if (nf_nat_tftp && ct->status &IPS_NAT_MASK ) ret =nf_nat_tftp (skb, ctinfo, exp); -else if (nf_ct_expect_related (exp) !=0 ) { +else if (nf_ct_expect_related (exp,0 ) !=0 ) {nf_ct_helper_log (skb, ct,"cannot add expectation" ); ret =NF_DROP ; }
net/netfilter/nf_nat_amanda.c +1 -1
@@ -48,7 +48,7 @@ static unsigned int help(struct sk_buff *skb,int res; exp->tuple.dst.u.tcp.port =htons (port); - res =nf_ct_expect_related (exp); + res =nf_ct_expect_related (exp,0 );if (res ==0 )break ;else if (res != -EBUSY ) {
net/netfilter/nf_nat_ftp.c +1 -1
@@ -91,7 +91,7 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb,int ret; exp->tuple.dst.u.tcp.port =htons (port); - ret =nf_ct_expect_related (exp); + ret =nf_ct_expect_related (exp,0 );if (ret ==0 )break ;else if (ret != -EBUSY ) {
net/netfilter/nf_nat_irc.c +1 -1
@@ -53,7 +53,7 @@ static unsigned int help(struct sk_buff *skb,int ret; exp->tuple.dst.u.tcp.port =htons (port); - ret =nf_ct_expect_related (exp); + ret =nf_ct_expect_related (exp,0 );if (ret ==0 )break ;else if (ret != -EBUSY ) {
net/netfilter/nf_nat_sip.c +5 -3
@@ -414,7 +414,7 @@ static unsigned int nf_nat_sip_expect(struct sk_buff *skb, unsigned int protoff,int ret; exp->tuple.dst.u.udp.port =htons (port); - ret =nf_ct_expect_related (exp); + ret =nf_ct_expect_related (exp,NF_CT_EXP_F_SKIP_MASTER );if (ret ==0 )break ;else if (ret != -EBUSY ) {
@@ -607,7 +607,8 @@ static unsigned int nf_nat_sdp_media(struct sk_buff *skb, unsigned int protoff,int ret; rtp_exp->tuple.dst.u.udp.port =htons (port); - ret =nf_ct_expect_related (rtp_exp); + ret =nf_ct_expect_related (rtp_exp, +NF_CT_EXP_F_SKIP_MASTER );if (ret == -EBUSY )continue ;else if (ret <0 ) {
@@ -615,7 +616,8 @@ static unsigned int nf_nat_sdp_media(struct sk_buff *skb, unsigned int protoff,break ; } rtcp_exp->tuple.dst.u.udp.port =htons (port +1 ); - ret =nf_ct_expect_related (rtcp_exp); + ret =nf_ct_expect_related (rtcp_exp, +NF_CT_EXP_F_SKIP_MASTER );if (ret ==0 )break ;else if (ret == -EBUSY ) {
net/netfilter/nf_nat_tftp.c +1 -1
@@ -30,7 +30,7 @@ static unsigned int help(struct sk_buff *skb, = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.udp.port; exp->dir =IP_CT_DIR_REPLY ; exp->expectfn = nf_nat_follow_master; -if (nf_ct_expect_related (exp) !=0 ) { +if (nf_ct_expect_related (exp,0 ) !=0 ) {nf_ct_helper_log (skb, exp->master,"cannot add expectation" );return NF_DROP ; }
net/netfilter/nft_ct.c +1 -1
@@ -1252,7 +1252,7 @@ static void nft_ct_expect_obj_eval(struct nft_object *obj, priv->l4proto, NULL, &priv->dport); exp->timeout.expires = jiffies + priv->timeout *HZ ; -if (nf_ct_expect_related (exp) !=0 ) +if (nf_ct_expect_related (exp,0 ) !=0 ) regs->verdict.code =NF_DROP ; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 4/14 netfilter: Update obsolete comments referring to ip_conntrack
In reply to Pablo Neira AyusoFrom: Yonatan Goldschmidt <[email protected]>
In 9fb9cbb1082d ("[NETFILTER]: Add nf_conntrack subsystem.") the new generic nf_conntrack was introduced, and it came to supersede the old ip_conntrack.
This change updates (some) of the obsolete comments referring to old file/function names of the ip_conntrack mechanism, as well as removes a few self-referencing comments that we shouldn't maintain anymore.
I did not update any comments referring to historical actions (e.g, comments like "this file was derived from ..." were left untouched, even if the referenced file is no longer here).
--- include/linux/netfilter/nf_conntrack_h323_asn1.h | 3 +-- net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 ++-- net/netfilter/Kconfig | 6 ++---- net/netfilter/nf_conntrack_core.c | 4 +--- net/netfilter/nf_conntrack_h323_asn1.c | 5 ++--- net/netfilter/nf_conntrack_proto_gre.c | 2 -- net/netfilter/nf_conntrack_proto_icmp.c | 2 +- net/netfilter/nf_nat_core.c | 2 +- 8 files changed, 10 insertions(+), 18 deletions(-)
include/linux/netfilter/nf_conntrack_h323_asn1.h +1 -2
@@ -1,7 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /**************************************************************************** -* ip_conntrack_h323_asn1.h - BER and PER decoding library for H.323 -* conntrack/NAT module. +* BER and PER decoding library for H.323 conntrack/NAT module. * * Copyright (c) 2006 by Jing Min Zhao <[email protected]> *
net/ipv4/netfilter/ipt_CLUSTERIP.c +2 -2
@@ -416,8 +416,8 @@ clusterip_tg(struct sk_buff *skb, const struct xt_action_param *par) ctinfo == IP_CT_RELATED_REPLY))return XT_CONTINUE ; -/* ip_conntrack_icmp guarantees us that we only have ICMP_ECHO, -* TIMESTAMP, INFO_REQUEST or ADDRESS type icmp packets from here +/* nf_conntrack_proto_icmp guarantees us that we only have ICMP_ECHO, +* TIMESTAMP, INFO_REQUEST or ICMP_ADDRESS type icmp packets from here * on, which all have an ID field [relevant for hashing]. */ hash =clusterip_hashfn (skb, cipinfo->config);
net/netfilter/Kconfig +2 -4
@@ -223,8 +223,6 @@ config NF_CONNTRACK_FTP of Network Address Translation on them. This is FTP support on Layer 3 independent connection tracking. - Layer 3 independent connection tracking is experimental scheme - which generalize ip_conntrack to support other layer 3 protocols. To compile it as a module, choose M here. If unsure, say N.
@@ -338,7 +336,7 @@ config NF_CONNTRACK_SIP help SIP is an application-layer control protocol that can establish, modify, and terminate multimedia sessions (conferences) such as - Internet telephony calls. With the ip_conntrack_sip and + Internet telephony calls. With the nf_conntrack_sip and the nf_nat_sip modules you can support the protocol on a connection tracking/NATing firewall.
@@ -1313,7 +1311,7 @@ config NETFILTER_XT_MATCH_HELPER depends on NETFILTER_ADVANCED help Helper matching allows you to match packets in dynamic connections - tracked by a conntrack-helper, ie. ip_conntrack_ftp + tracked by a conntrack-helper, ie. nf_conntrack_ftp To compile it as a module, choose M here. If unsure, say Y.
net/netfilter/nf_conntrack_core.c +1 -3
@@ -1817,9 +1817,7 @@ EXPORT_SYMBOL_GPL(nf_ct_kill_acct);#include <linux/netfilter/nfnetlink_conntrack.h> #include <linux/mutex.h> -/* Generic function for tcp/udp/sctp/dccp and alike. This needs to be -* in ip_conntrack_core, since we don't want the protocols to autoload -* or depend on ctnetlink */ +/* Generic function for tcp/udp/sctp/dccp and alike. */ int nf_ct_port_tuple_to_nlattr (struct sk_buff *skb,const struct nf_conntrack_tuple *tuple) {
net/netfilter/nf_conntrack_h323_asn1.c +2 -3
@@ -1,11 +1,10 @@// SPDX-License-Identifier: GPL-2.0-only /* -* ip_conntrack_helper_h323_asn1.c - BER and PER decoding library for H.323 -* conntrack/NAT module. +* BER and PER decoding library for H.323 conntrack/NAT module. * * Copyright (c) 2006 by Jing Min Zhao <[email protected]> * -* See ip_conntrack_helper_h323_asn1.h for details. +* See nf_conntrack_helper_h323_asn1.h for details. */ #ifdef __KERNEL__
net/netfilter/nf_conntrack_proto_gre.c +0 -2
@@ -1,7 +1,5 @@// SPDX-License-Identifier: GPL-2.0-only /* -* ip_conntrack_proto_gre.c - Version 3.0 -* * Connection tracking protocol helper module for GRE. * * GRE is a generic encapsulation protocol, which is generally not very
net/netfilter/nf_conntrack_proto_icmp.c +1 -1
@@ -215,7 +215,7 @@ int nf_conntrack_icmpv4_error(struct nf_conn *tmpl,return -NF_ACCEPT ; } -/* See ip_conntrack_proto_tcp.c */ +/* See nf_conntrack_proto_tcp.c */ if (state->net->ct.sysctl_checksum && state->hook ==NF_INET_PRE_ROUTING &&nf_ip_checksum (skb, state->hook, dataoff,IPPROTO_ICMP )) {
net/netfilter/nf_nat_core.c +1 -1
@@ -519,7 +519,7 @@ static void nf_nat_l4proto_unique_tuple(struct nf_conntrack_tuple *tuple,* and NF_INET_LOCAL_OUT, we change the destination to map into the * range. It might not be possible to get a unique tuple, but we try. * At worst (or if we race), we will end up with a final duplicate in -* __ip_conntrack_confirm and drop the packet. */ +* __nf_conntrack_confirm and drop the packet. */ static void get_unique_tuple(struct nf_conntrack_tuple *tuple, const struct nf_conntrack_tuple *orig_tuple,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 5/14 netfilter: nf_tables: fix module autoload for redir
In reply to Pablo Neira AyusoFrom: Christian Hesse <[email protected]>
Fix expression for autoloading.
--- net/netfilter/nft_redir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_redir.c +1 -1
@@ -291,4 +291,4 @@ module_exit(nft_redir_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Arturo Borrero Gonzalez <[email protected]>" ); -MODULE_ALIAS_NFT_EXPR ("nat" ); +MODULE_ALIAS_NFT_EXPR ("redir" );
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 6/14 netfilter: synproxy: fix erroneous tcp mss option
In reply to Pablo Neira AyusoFrom: Fernando Fernandez Mancera <[email protected]>
Now synproxy sends the mss value set by the user on client syn-ack packet instead of the mss value that client announced.
--- include/net/netfilter/nf_conntrack_synproxy.h | 1 + net/ipv4/netfilter/ipt_SYNPROXY.c | 2 ++ net/ipv6/netfilter/ip6t_SYNPROXY.c | 2 ++ net/netfilter/nf_synproxy_core.c | 4 ++-- net/netfilter/nft_synproxy.c | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-)
include/net/netfilter/nf_conntrack_synproxy.h +1 -0
@@ -68,6 +68,7 @@ struct synproxy_options {u8 options;u8 wscale;u16 mss; +u16 mss_encode;u32 tsval;u32 tsecr; };
net/ipv4/netfilter/ipt_SYNPROXY.c +2 -0
@@ -36,6 +36,8 @@ synproxy_tg4(struct sk_buff *skb, const struct xt_action_param *par) opts.options |=XT_SYNPROXY_OPT_ECN ; opts.options &= info->options; + opts.mss_encode = opts.mss; + opts.mss = info->mss;if (opts.options &XT_SYNPROXY_OPT_TIMESTAMP )synproxy_init_timestamp_cookie (info, &opts);else
net/ipv6/netfilter/ip6t_SYNPROXY.c +2 -0
@@ -36,6 +36,8 @@ synproxy_tg6(struct sk_buff *skb, const struct xt_action_param *par) opts.options |=XT_SYNPROXY_OPT_ECN ; opts.options &= info->options; + opts.mss_encode = opts.mss; + opts.mss = info->mss;if (opts.options &XT_SYNPROXY_OPT_TIMESTAMP )synproxy_init_timestamp_cookie (info, &opts);else
net/netfilter/nf_synproxy_core.c +2 -2
@@ -470,7 +470,7 @@ synproxy_send_client_synack(struct net *net,struct iphdr *iph, *niph;struct tcphdr *nth;unsigned int tcp_hdr_size; -u16 mss = opts->mss; +u16 mss = opts->mss_encode; iph =ip_hdr (skb);
@@ -884,7 +884,7 @@ synproxy_send_client_synack_ipv6(struct net *net,struct ipv6hdr *iph, *niph;struct tcphdr *nth;unsigned int tcp_hdr_size; -u16 mss = opts->mss; +u16 mss = opts->mss_encode; iph =ipv6_hdr (skb);
net/netfilter/nft_synproxy.c +2 -0
@@ -31,6 +31,8 @@ static void nft_synproxy_tcp_options(struct synproxy_options *opts, opts->options |=NF_SYNPROXY_OPT_ECN ; opts->options &= priv->info.options; + opts->mss_encode = opts->mss; + opts->mss = info->mss;if (opts->options &NF_SYNPROXY_OPT_TIMESTAMP )synproxy_init_timestamp_cookie (info, opts);else
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 7/14 netfilter: conntrack: always store window size un-scaled
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Jakub Jankowski reported following oddity:
After 3 way handshake completes, timeout of new connection is set to max_retrans (300s) instead of established (5 days).
shortened excerpt from pcap provided:
25.070622 IP (flags [DF], proto TCP (6), length 52)
10.8.5.4.1025 > 10.8.1.2.80: Flags [S], seq 11, win 64240, [wscale 8] 26.070462 IP (flags [DF], proto TCP (6), length 48)
10.8.1.2.80 > 10.8.5.4.1025: Flags [S.], seq 82, ack 12, win 65535, [wscale 3] 27.070449 IP (flags [DF], proto TCP (6), length 40)
10.8.5.4.1025 > 10.8.1.2.80: Flags [.], ack 83, win 512, length 0
Turns out the last_win is of u16 type, but we store the scaled value:
512 << 8 (== 0x20000) becomes 0 window.
The Fixes tag is not correct, as the bug has existed forever, but without that change all that this causes might cause is to mistake a window update (to-nonzero-from-zero) for a retransmit.
--- net/netfilter/nf_conntrack_proto_tcp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/netfilter/nf_conntrack_proto_tcp.c +5 -3
@@ -472,6 +472,7 @@ static bool tcp_in_window(const struct nf_conn *ct,struct ip_ct_tcp_state *receiver = &state->seen[!dir];const struct nf_conntrack_tuple *tuple = &ct->tuplehash[dir].tuple;__u32 seq, ack, sack, end, win, swin; +u16 win_raw;s32 receiver_offset;bool res, in_recv_win;
@@ -480,7 +481,8 @@ static bool tcp_in_window(const struct nf_conn *ct,*/ seq =ntohl (tcph->seq); ack = sack =ntohl (tcph->ack_seq); - win =ntohs (tcph->window); + win_raw =ntohs (tcph->window); + win = win_raw; end =segment_seq_plus_len (seq, skb->len, dataoff, tcph);if (receiver->flags &IP_CT_TCP_FLAG_SACK_PERM )
@@ -655,14 +657,14 @@ static bool tcp_in_window(const struct nf_conn *ct, && state->last_seq == seq && state->last_ack == ack && state->last_end == end - && state->last_win == win) + && state->last_win == win_raw) state->retrans++; else { state->last_dir = dir; state->last_seq = seq; state->last_ack = ack; state->last_end = end; - state->last_win = win; + state->last_win = win_raw; state->retrans =0 ; } }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 8/14 netfilter: nf_tables: don't fail when updating base chain policy
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
The following nftables test case fails on nf-next:
tests/shell/run-tests.sh tests/shell/testcases/transactions/0011chain_0
The test case contains:
add chain x y { type filter hook input priority 0; } add chain x y { policy drop; }"
The new test
if (chain->flags ^ flags)
return -EOPNOTSUPP;
triggers here, because chain->flags has NFT_BASE_CHAIN set, but flags is 0 because no flag attribute was present in the policy update.
Just fetch the current flag settings of a pre-existing chain in case userspace did not provide any.
--- net/netfilter/nf_tables_api.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/nf_tables_api.c +2 -0
@@ -1900,6 +1900,8 @@ static int nf_tables_newchain(struct net *net, struct sock *nlsk,if (nla[NFTA_CHAIN_FLAGS ]) flags =ntohl (nla_get_be32 (nla[NFTA_CHAIN_FLAGS ])); +else if (chain) + flags = chain->flags;nft_ctx_init (&ctx, net, skb, nlh, family, table, chain, nla);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 9/14 netfilter: nft_hash: fix symhash with modulus one
In reply to Pablo Neira AyusoFrom: Laura Garcia Liebana <[email protected]>
The rule below doesn't work as the kernel raises -ERANGE.
nft add rule netdev nftlb lb01 ip daddr set \
symhash mod 1 map { 0 : 192.168.0.10 } fwd to "eth0"This patch allows to use the symhash modulus with one element, in the same way that the other types of hashes and algorithms that uses the modulus parameter.
--- net/netfilter/nft_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_hash.c +1 -1
@@ -129,7 +129,7 @@ static int nft_symhash_init(const struct nft_ctx *ctx, priv->dreg =nft_parse_register (tb[NFTA_HASH_DREG ]); priv->modulus =ntohl (nla_get_be32 (tb[NFTA_HASH_MODULUS ])); -if (priv->modulus <=1 ) +if (priv->modulus <1 )return -ERANGE ;if (priv->offset + priv->modulus -1 < priv->offset)
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Fri, 19 Jul 2019 18:45:03 +0200
Quoted 1 line
The following patchset contains Netfilter fixes for net:
...
Quoted 3 lines
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Pulled.