netfilter: nf_conntrack: fix explicit helper attachment and NAT
Subsystems (2)
[email protected]
maintainerPATCH 1/1 netfilter: nf_conntrack: fix explicit helper attachment and NAT
From: Pablo Neira Ayuso <[email protected]>
Explicit helper attachment via the CT target is broken with NAT. Basically, nf_conntrack_alter_reply asks for looking the helper up again. Unfortunately, we don't have the conntrack template at that point anymore.
Since we don't want to rely on the automatic helper assignment, we can skip the second look-up and rely on the helper that was attached by iptables. Since now the user is in full control of helper attachment, we can assume he/she is making consistent configurations.
Interestingly, this bug was hidden by the automatic helper look-up code. But it can be easily trigger if you attach the helper in a non-standard port, eg.
iptables -I PREROUTING -t raw -p tcp --dport 8888 \ -j CT --helper ftp
Without this patch, if NAT is in use, this will not work.
I added the IPS_HELPER_BIT that allows us to differenciate between a helper that has been explicitly attached and those that have been automatically assigned. I didn't come up with a better solution.
--- include/linux/netfilter/nf_conntrack_common.h | 4 ++++ net/netfilter/nf_conntrack_helper.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)
include/linux/netfilter/nf_conntrack_common.h +4 -0
@@ -83,6 +83,10 @@ enum ip_conntrack_status {/* Conntrack is a fake untracked entry */ IPS_UNTRACKED_BIT =12 ,IPS_UNTRACKED = (1 <<IPS_UNTRACKED_BIT ), + +/* Conntrack got a helper explicitly attached via CT target. */ +IPS_HELPER_BIT =13 , + IPS_HELPER = (1 << IPS_HELPER_BIT), };/* Connection tracking event types */
net/netfilter/nf_conntrack_helper.c +12 -1
@@ -188,10 +188,21 @@ int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl,struct net *net =nf_ct_net (ct);int ret =0 ; +/* We already got a helper explicitly attached. The function +* nf_conntrack_alter_reply - in case NAT is in use - asks for looking +* the helper up again. Since now the user is in full control of +* making consistent helper configurations, skip this automatic +* re-lookup, otherwise we'll lose the helper. +*/ +if (test_bit (IPS_HELPER_BIT , &ct->status)) +return 0 ; +if (tmpl !=NULL ) { help =nfct_help (tmpl); -if (help !=NULL ) +if (help !=NULL ) { helper = help->helper; +set_bit (IPS_HELPER_BIT , &ct->status); + } } help =nfct_help (ct);
Signature · 1 line
1.7.9.5