serial: fix enable_irq_wake/disable_irq_wake imbalance in serial_core.c

[linux-2.6-omap-h63xx.git] / net / netfilter / nf_conntrack_extend.c

diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c
index 2bd9963b5b3ea4cf26d4abde679a72e8b28421a7..bcc19fa4ed1e07ab4277f7c02c933235cd0dc261 100644 (file)
--- a/net/netfilter/nf_conntrack_extend.c
+++ b/net/netfilter/nf_conntrack_extend.c
@@ -71,6 +71,9 @@ void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp)
        int i, newlen, newoff;
        struct nf_ct_ext_type *t;
 
+       /* Conntrack must not be confirmed to avoid races on reallocation. */
+       NF_CT_ASSERT(!nf_ct_is_confirmed(ct));
+
        if (!ct->ext)
                return nf_ct_ext_create(&ct->ext, id, gfp);