* [PATCH] netfilter: ipv6: fix overlap check for fragments
@ 2010-11-05 11:56 Shan Wei
2010-11-12 7:47 ` Shan Wei
2010-11-12 7:52 ` Patrick McHardy
0 siblings, 2 replies; 3+ messages in thread
From: Shan Wei @ 2010-11-05 11:56 UTC (permalink / raw)
To: nicolas.dichtel, David Miller, netdev@vger.kernel.org,
netfilter-devel, Patrick McHardy
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. */
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] netfilter: ipv6: fix overlap check for fragments
2010-11-05 11:56 [PATCH] netfilter: ipv6: fix overlap check for fragments Shan Wei
@ 2010-11-12 7:47 ` Shan Wei
2010-11-12 7:52 ` Patrick McHardy
1 sibling, 0 replies; 3+ messages in thread
From: Shan Wei @ 2010-11-12 7:47 UTC (permalink / raw)
To: nicolas.dichtel, netdev@vger.kernel.org, netfilter-devel,
Patrick McHardy
Cc: David Miller
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. */
--
Best Regards
-----
Shan Wei
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] netfilter: ipv6: fix overlap check for fragments
2010-11-05 11:56 [PATCH] netfilter: ipv6: fix overlap check for fragments Shan Wei
2010-11-12 7:47 ` Shan Wei
@ 2010-11-12 7:52 ` Patrick McHardy
1 sibling, 0 replies; 3+ messages in thread
From: Patrick McHardy @ 2010-11-12 7:52 UTC (permalink / raw)
To: Shan Wei
Cc: nicolas.dichtel, David Miller, netdev@vger.kernel.org,
netfilter-devel
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-11-12 7:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-05 11:56 [PATCH] netfilter: ipv6: fix overlap check for fragments Shan Wei
2010-11-12 7:47 ` Shan Wei
2010-11-12 7:52 ` Patrick McHardy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).