PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 20:51:30 +00:00
Code Issues Projects Releases Wiki Activity

Remove constant comparisons for values that cannot exceed the max

Browse Source
This commit is contained in:
dmiller
2020-10-15 18:51:20 +00:00
parent c4cfe174be
commit 922b8cbbc4
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libnetutil/HopByHopHeader.cc
View File

@@ -114,7 +114,8 @@ int HopByHopHeader::storeRecvData(const u8 *buf, size_t len){
/* Check that the HdrExtLen field makes sense: /* Check that the HdrExtLen field makes sense:
* 1) Check that it carries as many octets as it claims * 1) Check that it carries as many octets as it claims
* 2) Check that we don't exceed our internal storage space. */ * 2) Check that we don't exceed our internal storage space. */
if( ((unsigned int)(this->h.len+1))*8 > len || (this->h.len+1)*8 > HOPBYHOP_MAX_HEADER_LEN){ // h.len cannot exceed 0xff, so max is (0xff+1)*8, but HOPBYHOP_MAX_HEADER_LEN is 8 + 0x100*8
if( ((unsigned int)(this->h.len+1))*8 > len){
this->length=0; this->length=0;
return OP_FAILURE; return OP_FAILURE;
}else{ }else{

12
libnetutil/RoutingHeader.cc
View File

@@ -113,6 +113,10 @@ int RoutingHeader::storeRecvData(const u8 *buf, size_t len){
/* Our behaviour is different depending on the routing type. */ /* Our behaviour is different depending on the routing type. */
switch(this->h.type){ switch(this->h.type){
// No checks against ROUTING_HEADER_MAX_LEN because h.len cannot get that large:
// h.len is u8, max value 0xff, so (0xff+1)*8 = 0x800
// but ROUTING_HEADER_MAX_LEN is 8+256*8 = 0x808
/* Routing Type 0 (deprecated by RFC 5095)*/ /* Routing Type 0 (deprecated by RFC 5095)*/
case 0: case 0:
/* Type 0 has a variable length, but the value of its HdrExtLen /* Type 0 has a variable length, but the value of its HdrExtLen
@@ -121,7 +125,7 @@ int RoutingHeader::storeRecvData(const u8 *buf, size_t len){
* has as many bytes as the HdrExtLen field says it has, and * has as many bytes as the HdrExtLen field says it has, and
* that it doesn't exceed the maximum number of octets we * that it doesn't exceed the maximum number of octets we
* can store in this object. */ * can store in this object. */
if(this->h.len%2==1 || ((unsigned int)(this->h.len+1))*8 > len || (this->h.len+1)*8 > ROUTING_HEADER_MAX_LEN){ if(this->h.len%2==1 || ((unsigned int)(this->h.len+1))*8 > len){
this->length=0; this->length=0;
return OP_FAILURE; return OP_FAILURE;
}else{ }else{
@@ -154,7 +158,7 @@ int RoutingHeader::storeRecvData(const u8 *buf, size_t len){
* to store as much data as the header says it has. Obvioulsy, we * to store as much data as the header says it has. Obvioulsy, we
* check that we received as much data as the HdrExtLen advertises, * check that we received as much data as the HdrExtLen advertises,
* and that we don't exceed our own internal limit. */ * and that we don't exceed our own internal limit. */
if( ((unsigned int)(this->h.len+1))*8 > len || (this->h.len+1)*8 > ROUTING_HEADER_MAX_LEN){ if( ((unsigned int)(this->h.len+1))*8 > len){
this->length=0; this->length=0;
return OP_FAILURE; return OP_FAILURE;
}else{ }else{
@@ -197,7 +201,7 @@ int RoutingHeader::validate(){
* 1) The length in HdrExtLen is even. * 1) The length in HdrExtLen is even.
* 2) The length in HdrExtLen matches the octects stored in this object. * 2) The length in HdrExtLen matches the octects stored in this object.
* 3) The length in HdrExtLen does not exceed our internal limit. */ * 3) The length in HdrExtLen does not exceed our internal limit. */
if(this->h.len%2==1 || (this->h.len+1)*8 != this->length || (this->h.len+1)*8 > ROUTING_HEADER_MAX_LEN){ if(this->h.len%2==1 || (this->h.len+1)*8 != this->length){
return OP_FAILURE; return OP_FAILURE;
} }
@@ -232,7 +236,7 @@ int RoutingHeader::validate(){
/* If this is some routing type that we don't know about, we just /* If this is some routing type that we don't know about, we just
* check that the length makes sense because we cannot make assumptions * check that the length makes sense because we cannot make assumptions
* about the semantics of other fields. */ * about the semantics of other fields. */
if( this->length!=(this->h.len+1)*8 || (this->h.len+1)*8>ROUTING_HEADER_MAX_LEN){ if( this->length!=(this->h.len+1)*8){
return OP_FAILURE; return OP_FAILURE;
} }
break; break;