wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sniffer for IPv6

Browse Source 
1. Better length checking on the IPv6 extension headers.
2. Removed the default size update analogous to the IPv4 header check
function. It cannot ever be 0, so the update was unnecessary.
This commit is contained in:
John Safranek
2019-10-14 10:17:37 -07:00
parent 89db0da0aa
commit f0dfe5355b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sniffer.c
View File

@ -1642,7 +1642,7 @@ int ssl_SetPrivateKey(const char* address, int port, const char* keyFile,
static int CheckIp6Hdr(Ip6Hdr* iphdr, IpInfo* info, int length, char* error) static int CheckIp6Hdr(Ip6Hdr* iphdr, IpInfo* info, int length, char* error)
{ {
int version = IP_V(iphdr); int version = IP_V(iphdr);
int exthdrsz = 0; int exthdrsz = IP6_HDR_SZ;
TraceIP6(iphdr); TraceIP6(iphdr);
Trace(IP_CHECK_STR); Trace(IP_CHECK_STR);
@ -1657,6 +1657,10 @@ static int CheckIp6Hdr(Ip6Hdr* iphdr, IpInfo* info, int length, char* error)
Ip6ExtHdr* exthdr = (Ip6ExtHdr*)((byte*)iphdr + IP6_HDR_SZ); Ip6ExtHdr* exthdr = (Ip6ExtHdr*)((byte*)iphdr + IP6_HDR_SZ);
do { do {
int hdrsz = (exthdr->length + 1) * 8; int hdrsz = (exthdr->length + 1) * 8;
if (hdrsz > length - exthdrsz) {
SetError(PACKET_HDR_SHORT_STR, error, NULL, 0);
return -1;
}
exthdrsz += hdrsz; exthdrsz += hdrsz;
exthdr = (Ip6ExtHdr*)((byte*)exthdr + hdrsz); exthdr = (Ip6ExtHdr*)((byte*)exthdr + hdrsz);
} }
@ -1671,7 +1675,7 @@ static int CheckIp6Hdr(Ip6Hdr* iphdr, IpInfo* info, int length, char* error)
} }
#endif #endif
info->length = IP6_HDR_SZ + exthdrsz; info->length = exthdrsz;
info->total = ntohs(iphdr->length) + info->length; info->total = ntohs(iphdr->length) + info->length;
/* IPv6 doesn't include its own header size in the length like v4. */ /* IPv6 doesn't include its own header size in the length like v4. */
info->src.version = IPV6; info->src.version = IPV6;
@ -1679,11 +1683,6 @@ static int CheckIp6Hdr(Ip6Hdr* iphdr, IpInfo* info, int length, char* error)
info->dst.version = IPV6; info->dst.version = IPV6;
XMEMCPY(info->dst.ip6, iphdr->dst, sizeof(info->dst.ip6)); XMEMCPY(info->dst.ip6, iphdr->dst, sizeof(info->dst.ip6));
/* This needs to massage the length and size to match what the sniffer
* expects. IPv4 and IPv6 treat the length parameter differently. */
if (info->total == 0)
info->total = length; /* reassembled may be off */
return 0; return 0;
} }