Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22e091e5 authored by Shan Wei's avatar Shan Wei Committed by Patrick McHardy
Browse files

netfilter: ipv6: fix overlap check for fragments 



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: default avatarShan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent ac5aa2e3

net/ipv6/netfilter/nf_conntrack_reasm.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb, 


	/* 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. */