diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-04-14 11:15:51 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-04-14 11:15:51 +0200 |
| commit | 55871d04793d9c069ee277b1e98794b88d92ed80 (patch) | |
| tree | 7e06b1ae438b45e9d5b5da8146ba197222d875f4 /include | |
| parent | 8c87238b726e543f8af4bdb4296020a328df4744 (diff) | |
| download | linux-3.10-55871d04793d9c069ee277b1e98794b88d92ed80.tar.gz linux-3.10-55871d04793d9c069ee277b1e98794b88d92ed80.tar.bz2 linux-3.10-55871d04793d9c069ee277b1e98794b88d92ed80.zip | |
[NETFILTER]: nf_conntrack_extend: warn on confirmed conntracks
New extensions may only be added to unconfirmed conntracks to avoid races
when reallocating the storage.
Also change NF_CT_ASSERT to use WARN_ON to get backtraces.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index bb9fc852e97..4a0496aa32d 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -65,14 +65,7 @@ union nf_conntrack_help { #include <linux/timer.h> #ifdef CONFIG_NETFILTER_DEBUG -#define NF_CT_ASSERT(x) \ -do { \ - if (!(x)) \ - /* Wooah! I'm tripping my conntrack in a frenzy of \ - netplay... */ \ - printk("NF_CT_ASSERT: %s:%i(%s)\n", \ - __FILE__, __LINE__, __FUNCTION__); \ -} while(0) +#define NF_CT_ASSERT(x) WARN_ON(!(x)) #else #define NF_CT_ASSERT(x) #endif |