PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-23 14:49:02 +00:00
Code Issues Projects Releases Wiki Activity

(The last paragraph of this message has an implementation re-work suggestion)

Browse Source 
o Fixed host discovery probe matching when looking at the returned TCP data in
  an ICMP error message.  This could lead to incorrectly discarded responses
  and the debugging error message: "Bogus trynum or sequence number in ICMP
  error message" [Kris]

Fyodor was getting the error message "Got ICMP error with a TCP header that was
too short" while scanning, and looked at the code to see a comment I made about
requiring 12 bytes of TCP data in an ICMP error message instead of the minimum
RFC requirement of 8 bytes.

I made this comment and requirement because tcp_trynum_pingseq_decode() was
being called on the TCP data, and was using the ACK field (which is just past
the 8 byte range).  However, upon further inspection, we came to the conclusion
that this code was broken because examining the ACK field should only be done
on a TCP response, not on our own probe (which is what we're looking at in the
ICMP data).

This assumes that -g is used (the only reason that the SEQ/ACK is checked since
the source port number is used otherwise), but the code is also broken without
it because the *_decode() function checks the destination port number rather
than the source port (which should be checked since it's our own probe we're
looking at).

So I've removed the 12-byte requirement and pingseq checking calls, and just
check that the received SEQ number matches the probe SEQ number.


Should we just work with the SEQ/ACK matching when using TCP and leave the
pingseq/trynum port number encoding to UDP?  This means behavior won't change
with the use of -g, and it should be guaranteed to be there since we'll only
be looking at whole TCP headers rather than any smaller chunks.  Plus, the SEQ
number is already getting encoded with the pingseq/trynum info, we're just not
decoding the ACK responses unless -g is used.
This commit is contained in:
kris
2008-07-26 00:25:24 +00:00
parent 9cbd4d40ba
commit 332e8aa176
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@@ -52,6 +52,11 @@ o [NSE] script_scan_result structure has been changed to a class,
o [NSE] The runlevel structure has been placed in the thread record structure
so we no longer need to manage the runlevel explicitly on the heap. [Patrick]
o Fixed host discovery probe matching when looking at the returned TCP data in
an ICMP error message. This could lead to incorrectly discarded responses
and the debugging error message: "Bogus trynum or sequence number in ICMP
error message" [Kris]
o Nsock now supports binding to a local address and setting IPv4 options
with nsi_set_localaddr() and nsi_set_ipoptions(), respectively. [Kris]

21
scan_engine.cc
View File

@@ -4197,16 +4197,6 @@ static int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
error("Got ICMP error referring to TCP msg which we did not send");
continue;
}
/* We need to check for a few more bytes because
* tcp_trynum_pingseq_decode() below can use th_ack (which is beyond
* the +8 bytes checked for above)
*/
requiredbytes += 4U;
if (bytes < requiredbytes) {
if (o.debugging)
error("Got ICMP error with a TCP header that was too short");
continue;
}
struct tcp_hdr *tcp = (struct tcp_hdr *) (((char *) ip2) + 4 * ip2->ip_hl);
/* Now ensure this host is even in the incomplete list */
memset(&sin, 0, sizeof(sin));
@@ -4233,19 +4223,10 @@ static int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
/* Ensure the connection info matches. */
if (probe->dport() != ntohs(tcp->th_dport)
|| probe->sport() != ntohs(tcp->th_sport)
|| probe->tcpseq() != ntohl(tcp->th_seq)
|| hss->target->v4sourceip()->s_addr != ip->ip_dst.s_addr)
continue;
goodseq = tcp_trynum_pingseq_decode(USI, tcp, &trynum, &pingseq);
if (!goodseq) {
if (o.debugging)
error("Bogus trynum or sequence number in ICMP error message");
continue;
}
if (!probe->check_tryno_pingseq(trynum, pingseq))
continue;
/* If we made it this far, we found it. We don't yet know if it's
going to change a host state (goodone) or not. */
break;