From c6724ce3027b11151d39b4d19b85b9401462eebd Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 6 Apr 2008 23:40:06 -0700 Subject: [PATCH] INET: inet_frag_evictor() must run with BH disabled Part of upstream commit: e8e16b706e8406f1ab3bccab16932ebc513896d8 Based upon a lockdep trace from Dave Jones. Signed-off-by: David S. Miller Signed-off-by: Chris Wright --- net/ipv6/netfilter/nf_conntrack_reasm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index e170c67c47a5b..89f95f9c7a8c7 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -147,7 +147,9 @@ static __inline__ void fq_kill(struct nf_ct_frag6_queue *fq) static void nf_ct_frag6_evictor(void) { + local_bh_disable(); inet_frag_evictor(&nf_frags); + local_bh_enable(); } static void nf_ct_frag6_expire(unsigned long data) -- 2.47.2