From: Pablo Neira Ayuso Date: Tue, 19 Aug 2008 04:30:55 +0000 (-0700) Subject: netfilter: ctnetlink: fix double helper assignation for NAT'ed conntracks X-Git-Tag: v2.6.27-rc4~39^2~8 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1575e7ea018fec992b94a12a1a491ce693ae9eac;p=pandora-kernel.git netfilter: ctnetlink: fix double helper assignation for NAT'ed conntracks If we create a conntrack that has NAT handlings and a helper, the helper is assigned twice. This happens because nf_nat_setup_info() - via nf_conntrack_alter_reply() - sets the helper before ctnetlink, which indeed does not check if the conntrack already has a helper as it thinks that it is a brand new conntrack. The fix moves the helper assignation before the set of the status flags. This avoids a bogus assertion in __nf_ct_ext_add (if netfilter assertions are enabled) which checks that the conntrack must not be confirmed. This problem was introduced in 2.6.23 with the netfilter extension infrastructure. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy --- Reading git-diff-tree failed