netfilter fix (7/7): don't call helpers expectfn() for unconfirmed connections
Subsystems (2)
PATCH 1/1 netfilter fix (7/7): don't call helpers expectfn() for unconfirmed connections
Hi Dave!
Here goes the seventh and last fix.
Author: Patrick McHardy <[email protected]>
Do not delete timer / call expect function for connections matching expectations from unconfirmed connections.
net/ipv4/netfilter/ip_conntrack_core.c +9 -6
@@ -705,6 +705,14 @@ struct ip_conntrack_expect *, tuple);READ_UNLOCK (&ip_conntrack_expect_tuple_lock); +/* If master is not in hash table yet (ie. packet hasn't left +this machine yet), how can other end know about expected? +Hence these are not the droids you are looking for (if +master ct never got confirmed, we'd hold a reference to it +and weird things would happen to future packets). */ +if (expected && !is_confirmed (expected->expectant)) + expected =NULL ; +/* Look up the conntrack helper for master connections only */ if (!expected) conntrack->helper =ip_ct_find_helper (&repl_tuple);
@@ -715,12 +723,7 @@ && ! del_timer(&expected->timeout)) expected =NULL ; -/* If master is not in hash table yet (ie. packet hasn't left -this machine yet), how can other end know about expected? -Hence these are not the droids you are looking for (if -master ct never got confirmed, we'd hold a reference to it -and weird things would happen to future packets). */ -if (expected &&is_confirmed (expected->expectant)) { +if (expected) {DEBUGP ("conntrack: expectation arrives ct=%p exp=%p\n" , conntrack, expected);/* Welcome, Mr. Bond. We've been expecting you... */
Please apply, thanks.
Signature · 5 lines
- Harald Welte <[email protected]> http://www.netfilter.org/ ============================================================================ "Fragmentation is like classful addressing -- an interesting early architectural error that shows how much experimentation was going on while IP was being designed." -- Paul Vixie