d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a tautological compare for offset != 0.

Browse Source 
MFC after:	1 week
This commit is contained in:
cy 2019-06-26 00:53:46 +00:00
parent 4980170c2e
commit 424652811c
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/contrib/ipfilter/netinet/fil.c
View File

@ -1732,24 +1732,22 @@ ipf_pr_ipv4hdr(fin)
fi->fi_flx |= FI_FRAG; fi->fi_flx |= FI_FRAG;
off &= IP_OFFMASK; off &= IP_OFFMASK;
if (off != 0) { fin->fin_flx |= FI_FRAGBODY;
fin->fin_flx |= FI_FRAGBODY; off <<= 3;
off <<= 3; if ((off + fin->fin_dlen > 65535) ||
if ((off + fin->fin_dlen > 65535) || (fin->fin_dlen == 0) ||
(fin->fin_dlen == 0) || ((morefrag != 0) && ((fin->fin_dlen & 7) != 0))) {
((morefrag != 0) && ((fin->fin_dlen & 7) != 0))) { /*
/* * The length of the packet, starting at its
* The length of the packet, starting at its * offset cannot exceed 65535 (0xffff) as the
* offset cannot exceed 65535 (0xffff) as the * length of an IP packet is only 16 bits.
* length of an IP packet is only 16 bits. *
* * Any fragment that isn't the last fragment
* Any fragment that isn't the last fragment * must have a length greater than 0 and it
* must have a length greater than 0 and it * must be an even multiple of 8.
* must be an even multiple of 8. */
*/ fi->fi_flx |= FI_BAD;
fi->fi_flx |= FI_BAD; DT1(ipf_fi_bad_fragbody_gt_65535, fr_info_t *, fin);
DT1(ipf_fi_bad_fragbody_gt_65535, fr_info_t *, fin);
}
} }
} }
fin->fin_off = off; fin->fin_off = off;