Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kick zero-sized fragments. We can't allow them to enter; two fragments 

could be put at the same offset.
This commit is contained in:
maxv 2018-01-25 20:55:15 +00:00
parent 44fdebe499
commit 2cd98cd7f9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/netinet6/frag6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: frag6.c,v 1.63 2018/01/25 15:55:57 maxv Exp $ */
/* $NetBSD: frag6.c,v 1.64 2018/01/25 20:55:15 maxv Exp $ */
/* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */
/*
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.63 2018/01/25 15:55:57 maxv Exp $");
__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.64 2018/01/25 20:55:15 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@ -189,13 +189,14 @@ frag6_input(struct mbuf **mp, int *offp, int proto)
}
/*
* check whether fragment packet's fragment length is
* Check whether fragment packet's fragment length is non-zero and
* multiple of 8 octets.
* sizeof(struct ip6_frag) == 8
* sizeof(struct ip6_hdr) = 40
*/
if ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) &&
(((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
(((ntohs(ip6->ip6_plen) - offset) == 0) ||
((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER,
offsetof(struct ip6_hdr, ip6_plen));
in6_ifstat_inc(dstifp, ifs6_reass_fail);