From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shan Wei Subject: [PATCH] netfilter: ipv6: fix overlap check for fragments Date: Fri, 05 Nov 2010 19:56:40 +0800 Message-ID: <4CD3F0F8.5030205@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit To: nicolas.dichtel@6wind.com, David Miller , "netdev@vger.kernel.org" , netfilter-devel@vger.kernel.org, Patrick McHardy Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:64378 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751803Ab0KEL4U (ORCPT ); Fri, 5 Nov 2010 07:56:20 -0400 Sender: netfilter-devel-owner@vger.kernel.org List-ID: The type of FRAG6_CB(prev)->offset is int, skb->len is *unsigned* int, and offset is int. Without this patch, type conversion occurred to this expression, when (FRAG6_CB(prev)->offset + prev->len) is less than offset. Signed-off-by: Shan Wei --- net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 3a3f129..79d43aa 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -286,7 +286,7 @@ found: /* Check for overlap with preceding fragment. */ if (prev && - (NFCT_FRAG6_CB(prev)->offset + prev->len) - offset > 0) + (NFCT_FRAG6_CB(prev)->offset + prev->len) > offset) goto discard_fq; /* Look for overlap with succeeding segment. */ -- 1.6.3.3