PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-10 09:49:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix build_icmp_raw and build_igmp_raw filling the packet data payload with

Browse Source 
zeroes instead of the supplied random data, when nmap is invoked with --data-length.
This commit is contained in:
shinnok
2011-06-18 11:20:54 +00:00
parent 90153308cb
commit e8bd001619
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tcpip.cc
View File

@@ -613,7 +613,7 @@ u8 *build_ip_raw(const struct in_addr *source,
tos, ipid, df ? IP_DF : 0, myttl, proto, source, victim); tos, ipid, df ? IP_DF : 0, myttl, proto, source, victim);
/* We should probably copy the data over too */ /* We should probably copy the data over too */
if (data) if (data && datalen)
memcpy((u8 *) ip + sizeof(struct ip) + ipoptlen, data, datalen); memcpy((u8 *) ip + sizeof(struct ip) + ipoptlen, data, datalen);
*outpacketlen = packetlen; *outpacketlen = packetlen;
@@ -1030,9 +1030,10 @@ u8 *build_icmp_raw(const struct in_addr *source,
fatal("Unknown icmp type/code (%d/%d) in %s", ptype, pcode, __func__); fatal("Unknown icmp type/code (%d/%d) in %s", ptype, pcode, __func__);
} }
if (datalen > 0) { /* Copy the data over too */
if (data && datalen) {
icmplen += MIN(dlen, datalen); icmplen += MIN(dlen, datalen);
memset(datastart, 0, MIN(dlen, datalen)); memcpy(datastart, data, MIN(dlen, datalen));
} }
/* Fill out the ping packet. All the ICMP types handled by this function have /* Fill out the ping packet. All the ICMP types handled by this function have
@@ -1138,9 +1139,10 @@ u8 *build_igmp_raw(const struct in_addr *source,
fatal("Unknown igmp type (%d) in %s", ptype, __func__); fatal("Unknown igmp type (%d) in %s", ptype, __func__);
} }
if (datalen > 0) { /* Copy the data over too */
if (data && datalen) {
igmplen += MIN(dlen, datalen); igmplen += MIN(dlen, datalen);
memset(datastart, 0, MIN(dlen, datalen)); memcpy(datastart, data, MIN(dlen, datalen));
} }
igmp.igmp_cksum = 0; igmp.igmp_cksum = 0;