diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-09-07 18:20:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-07 18:20:08 -0700 |
| commit | 887464a41fde7e9e1e11ca86748338033c502446 (patch) | |
| tree | add59cbaf1f8fc207cb0d2bbd18e1ac97a355246 /net | |
| parent | 66bf79182d6531c14c1f9a507b6bbf374a2ae4cd (diff) | |
| download | blackbird-obmc-linux-887464a41fde7e9e1e11ca86748338033c502446.tar.gz blackbird-obmc-linux-887464a41fde7e9e1e11ca86748338033c502446.zip | |
netfilter: nf_conntrack_gre: more locking around keymap list
gre_keymap_list should be protected in all places.
(unless I'm misreading something)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_gre.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c index 654a4f7f12c6..b308bb4c12b9 100644 --- a/net/netfilter/nf_conntrack_proto_gre.c +++ b/net/netfilter/nf_conntrack_proto_gre.c @@ -97,10 +97,14 @@ int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir, kmp = &help->help.ct_pptp_info.keymap[dir]; if (*kmp) { /* check whether it's a retransmission */ + read_lock_bh(&nf_ct_gre_lock); list_for_each_entry(km, &gre_keymap_list, list) { - if (gre_key_cmpfn(km, t) && km == *kmp) + if (gre_key_cmpfn(km, t) && km == *kmp) { + read_unlock_bh(&nf_ct_gre_lock); return 0; + } } + read_unlock_bh(&nf_ct_gre_lock); pr_debug("trying to override keymap_%s for ct %p\n", dir == IP_CT_DIR_REPLY ? "reply" : "orig", ct); return -EEXIST; |
