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

Pass a length argument to frame_is_arp.

Browse Source
This commit is contained in:
david
2012-03-21 21:32:04 +00:00
parent ae5c653264
commit 29a4522c33
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libnetutil/netutil.cc
View File

@@ -3922,7 +3922,10 @@ void set_pcap_filter(const char *device, pcap_t *pd, const char *bpf, ...) {
/* Returns true if the captured frame is ARP. This function understands the /* Returns true if the captured frame is ARP. This function understands the
datalink types DLT_EN10MB and DLT_LINUX_SLL. */ datalink types DLT_EN10MB and DLT_LINUX_SLL. */
static bool frame_is_arp(const u8 *frame, int datalink) { static bool frame_is_arp(const u8 *frame, size_t len, int datalink) {
if (len < 16)
return false;
if (datalink == DLT_EN10MB) { if (datalink == DLT_EN10MB) {
return ntohs(*((u16 *) (frame + 12))) == ETH_TYPE_ARP; return ntohs(*((u16 *) (frame + 12))) == ETH_TYPE_ARP;
} else if (datalink == DLT_LINUX_SLL) { } else if (datalink == DLT_LINUX_SLL) {
@@ -4007,7 +4010,7 @@ int read_arp_reply_pcap(pcap_t *pd, u8 *sendermac,
if (p && head.caplen >= offset + 28) { if (p && head.caplen >= offset + 28) {
/* hw type eth (0x0001), prot ip (0x0800), /* hw type eth (0x0001), prot ip (0x0800),
hw size (0x06), prot size (0x04) */ hw size (0x06), prot size (0x04) */
if (frame_is_arp(p, datalink) && if (frame_is_arp(p, head.caplen, datalink) &&
memcmp(p + offset, "\x00\x01\x08\x00\x06\x04\x00\x02", 8) == 0) { memcmp(p + offset, "\x00\x01\x08\x00\x06\x04\x00\x02", 8) == 0) {
memcpy(sendermac, p + offset + 8, 6); memcpy(sendermac, p + offset + 8, 6);
/* I think alignment should allow this ... */ /* I think alignment should allow this ... */