PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-22 15:39:03 +00:00
Code Issues Projects Releases Wiki Activity

Check for an address family mismatch after parsign NetBlocks.

Browse Source 
This caused a segfault in reverse DNS resolution when the v4hostip of an
IPv6 target was accessed:
./nmap -sL 2001:500:88:200::10
This commit is contained in:
david
2013-04-22 21:56:09 +00:00
parent 4e70079eb2
commit aa76963dcd
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
targets.cc
View File

@@ -346,6 +346,20 @@ int TargetGroup::get_next_host(struct sockaddr_storage *ss, size_t *sslen) {
delete netblock_hostname;
}
/* Check for proper address family. Give a specific error message for IPv6
specifications appearing in IPv4 mode. */
if (o.af() == AF_INET && dynamic_cast<NetBlockIPv6Netmask *>(this->netblock) != NULL) {
error("%s looks like an IPv6 target specification -- you have to use the -6 option.",
this->netblock->str().c_str());
return -1;
}
if ((o.af() == AF_INET && dynamic_cast<NetBlockIPv4Ranges *>(this->netblock) == NULL) ||
(o.af() == AF_INET6 && dynamic_cast<NetBlockIPv6Netmask *>(this->netblock) == NULL)) {
error("Address family mismatch in target specification \"%s\".",
this->netblock->str().c_str());
return -1;
}
if (this->netblock->next(ss, sslen))
return 0;
else
@@ -552,6 +566,8 @@ tryagain:
goto tryagain;
}
assert(ss.ss_family == o.af());
/* If we are resuming from a previous scan, we have already finished scanning
up to o.resume_ip. */
if (ss.ss_family == AF_INET && o.resume_ip.s_addr) {