| Message ID | 4CD3F0F8.5030205@cn.fujitsu.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi Patrick: Would you apply this to your tree. The similar patch for ipv6 has been applied by David . See http://git.kernel.org/?p=linux/kernel/git/davem/net-2.6.git;a=commit;h=f46421416fb6b91513fb687d6503142cd99034a5 Shan Wei wrote, at 11/05/2010 07:56 PM: > 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 <shanwei@cn.fujitsu.com> > --- > 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. */
On 05.11.2010 12:56, Shan Wei wrote: > 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. Applied, thanks Shan. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. */
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 <shanwei@cn.fujitsu.com> --- net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)