Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3db7e93d3308fb882884b9f024235d6fbf542034

Authored by Pablo Neira Ayuso
Committed by Patrick McHardy
1 parent 9d0db8b6b1

netfilter: ecache: always set events bits, filter them later 

For the following rule:

iptables -I PREROUTING -t raw -j CT --ctevents assured

The event delivered looks like the following:

 [UPDATE] tcp      6 src=192.168.0.2 dst=192.168.1.2 sport=37041 dport=80 src=192.168.1.2 dst=192.168.1.100 sport=80 dport=37041 [ASSURED]

Note that the TCP protocol state is not included. For that reason
the CT event filtering is not very useful for conntrackd.

To resolve this issue, instead of conditionally setting the CT events
bits based on the ctmask, we always set them and perform the filtering
in the late stage, just before the delivery.

Thus, the event delivered looks like the following:

 [UPDATE] tcp      6 432000 ESTABLISHED src=192.168.0.2 dst=192.168.1.2 sport=37041 dport=80 src=192.168.1.2 dst=192.168.1.100 sport=80 dport=37041 [ASSURED]

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

include/net/netfilter/nf_conntrack_ecache.h
Diff comments   View file @ 3db7e93
... ... @@ -77,9 +77,6 @@
77 77 if (e == NULL)
78 78 return;
79 79  
80   - if (!(e->ctmask & (1 << event)))
81   - return;
82   -
83 80 set_bit(event, &e->cache);
84 81 }
85 82  
net/netfilter/nf_conntrack_ecache.c
Diff comments   View file @ 3db7e93
... ... @@ -63,6 +63,9 @@
63 63 * this does not harm and it happens very rarely. */
64 64 unsigned long missed = e->missed;
65 65  
  66 + if (!((events | missed) & e->ctmask))
  67 + goto out_unlock;
  68 +
66 69 ret = notify->fcn(events | missed, &item);
67 70 if (unlikely(ret < 0 || missed)) {
68 71 spin_lock_bh(&ct->lock);