From: "Sebastian Pöhn" <sebastian.poehn@gmail.com>
To: netdev@vger.kernel.org
Subject: nf_conntrack_h323: Fix locking in process_urq
Date: Fri, 15 Jan 2016 22:55:18 +0100 [thread overview]
Message-ID: <1452894918.4622.3.camel@gmail.com> (raw)
nf_ct_remove_expectations has to be called under nf_conntrack_expect_lock
Signed-off-by: Sebastian Pöhn <sebastian.poehn@gmail.com>
---
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 9511af0..d477375 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -1518,7 +1518,9 @@ static int process_urq(struct sk_buff *skb, struct nf_conn *ct,
}
/* Clear old expect */
+ spin_lock_bh(&nf_conntrack_expect_lock);
nf_ct_remove_expectations(ct);
+ spin_unlock_bh(&nf_conntrack_expect_lock);
info->sig_port[dir] = 0;
info->sig_port[!dir] = 0;
next reply other threads:[~2016-01-15 21:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 21:55 Sebastian Pöhn [this message]
2016-01-15 22:42 ` nf_conntrack_h323: Fix locking in process_urq Florian Westphal
2016-01-15 22:57 ` Sebastian Pöhn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452894918.4622.3.camel@gmail.com \
--to=sebastian.poehn@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.