[NETFILTER]: ip_conntrack_expect_related must not free expectation

Browse source

If a connection tracking helper tells us to expect a connection, and
we're already expecting that connection, we simply free the one they
gave us and return success.

The problem is that NAT helpers (eg. FTP) have to allocate the
expectation first (to see what port is available) then rewrite the
packet.  If that rewrite fails, they try to remove the expectation,
but it was freed in ip_conntrack_expect_related.

This is one example of a larger problem: having registered the
expectation, the pointer is no longer ours to use.  Reference counting
is needed for ctnetlink anyway, so introduce it now.

To have a single "put" path, we need to grab the reference to the
connection on creation, rather than open-coding it in the caller.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

Rusty Russell 2005-07-21 13:14:46 -07:00 • committed by David S. Miller

parent 4aa49d130d

commit 4acdbdbe50

12 changed files with 46 additions and 60 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/linux/netfilter_ipv4/ip_conntrack.h

View file

7

include/linux/netfilter_ipv4/ip_conntrack_helper.h

View file