36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From c13a84a830a208fb3443628773c8ca0557773cc7 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Michal=20Kube=C4=8Dek?= <mkubecek@suse.cz>
|
|
Date: Wed, 11 Sep 2013 10:17:27 +0200
|
|
Subject: [PATCH] netfilter: nf_conntrack: use RCU safe kfree for conntrack
|
|
extensions
|
|
|
|
Commit 68b80f11 (netfilter: nf_nat: fix RCU races) introduced
|
|
RCU protection for freeing extension data when reallocation
|
|
moves them to a new location. We need the same protection when
|
|
freeing them in nf_ct_ext_free() in order to prevent a
|
|
use-after-free by other threads referencing a NAT extension data
|
|
via bysource list.
|
|
|
|
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
---
|
|
include/net/netfilter/nf_conntrack_extend.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
|
|
index ff95434..88a1d40 100644
|
|
--- a/include/net/netfilter/nf_conntrack_extend.h
|
|
+++ b/include/net/netfilter/nf_conntrack_extend.h
|
|
@@ -86,7 +86,7 @@ static inline void nf_ct_ext_destroy(struct nf_conn *ct)
|
|
static inline void nf_ct_ext_free(struct nf_conn *ct)
|
|
{
|
|
if (ct->ext)
|
|
- kfree(ct->ext);
|
|
+ kfree_rcu(ct->ext, rcu);
|
|
}
|
|
|
|
/* Add this type, returns pointer to data or NULL. */
|
|
--
|
|
1.8.3.1
|
|
|