]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
netfilter: ipv6: fix overlap check for fragments
authorShan Wei <shanwei@cn.fujitsu.com>
Fri, 12 Nov 2010 07:51:55 +0000 (08:51 +0100)
committerPatrick McHardy <kaber@trash.net>
Fri, 12 Nov 2010 07:51:55 +0000 (08:51 +0100)
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>
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/ipv6/netfilter/nf_conntrack_reasm.c

index 3a3f129a44cb3561dd3e135164626f8352c565b7..79d43aa8fa8da80b405689bf7c751d7a9cc89ad4 100644 (file)
@@ -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. */