From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vasily Averin Subject: [PATCH] ipv4: "conntrack zones" support for defrag user check in ip_expire Date: Sat, 03 May 2014 03:14:04 +0400 Message-ID: <536426BC.7020509@parallels.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Florian Westphal , netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, Pablo Neira Ayuso , "David S. Miller" To: Patrick McHardy Return-path: Received: from mailhub.sw.ru ([195.214.232.25]:18838 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751366AbaEBXPj (ORCPT ); Fri, 2 May 2014 19:15:39 -0400 Sender: netfilter-devel-owner@vger.kernel.org List-ID: Defrag user check in ip_expire was not updated after adding support for "conntrack zones" Signed-off-by: Vasily Averin --- net/ipv4/ip_fragment.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index c10a3ce..ed32313 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -232,8 +232,9 @@ static void ip_expire(unsigned long arg) * "Fragment Reassembly Timeout" message, per RFC792. */ if (qp->user == IP_DEFRAG_AF_PACKET || - (qp->user == IP_DEFRAG_CONNTRACK_IN && - skb_rtable(head)->rt_type != RTN_LOCAL)) + ((qp->user >= IP_DEFRAG_CONNTRACK_IN) && + (qp->user <= __IP_DEFRAG_CONNTRACK_IN_END) && + (skb_rtable(head)->rt_type != RTN_LOCAL))) goto out_rcu_unlock; -- 1.7.5.4