From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 3/6] netfilter: cttimeout: fix deadlock due to erroneous unlock/lock conversion
Date: Tue, 16 Feb 2016 18:02:34 +0100 [thread overview]
Message-ID: <1455642157-6864-4-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1455642157-6864-1-git-send-email-pablo@netfilter.org>
From: Florian Westphal <fw@strlen.de>
The spin_unlock call should have been left as-is, revert.
Fixes: b16c29191dc89bd ("netfilter: nf_conntrack: use safer way to lock all buckets")
Reported-by: kernel test robot <fengguang.wu@intel.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nfnetlink_cttimeout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c
index 94837d2..2671b9d 100644
--- a/net/netfilter/nfnetlink_cttimeout.c
+++ b/net/netfilter/nfnetlink_cttimeout.c
@@ -312,7 +312,7 @@ static void ctnl_untimeout(struct net *net, struct ctnl_timeout *timeout)
hlist_nulls_for_each_entry(h, nn, &net->ct.hash[i], hnnode)
untimeout(h, timeout);
}
- nf_conntrack_lock(&nf_conntrack_locks[i % CONNTRACK_LOCKS]);
+ spin_unlock(&nf_conntrack_locks[i % CONNTRACK_LOCKS]);
}
local_bh_enable();
}
--
2.1.4
next prev parent reply other threads:[~2016-02-16 17:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 17:02 [PATCH 0/6] Netfilter fixes for net Pablo Neira Ayuso
2016-02-16 17:02 ` [PATCH 1/6] netfilter: conntrack: resched in nf_ct_iterate_cleanup Pablo Neira Ayuso
2016-02-16 17:02 ` [PATCH 2/6] netfilter: nfnetlink: use original skbuff when acking batches Pablo Neira Ayuso
2016-02-16 17:02 ` Pablo Neira Ayuso [this message]
2016-02-16 17:02 ` [PATCH 4/6] netfilter: nfnetlink: correctly validate length of batch messages Pablo Neira Ayuso
2016-02-16 17:02 ` [PATCH 5/6] netfilter: tee: select NF_DUP_IPV6 unconditionally Pablo Neira Ayuso
2016-02-16 17:02 ` [PATCH 6/6] netfilter: nft_counter: fix erroneous return values Pablo Neira Ayuso
2016-02-16 17:56 ` [PATCH 0/6] Netfilter fixes for net David Miller
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=1455642157-6864-4-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@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.