Skip to content

More sniffer length checks #9643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgarske merged 1 commit into from
Jan 15, 2026
Merged

More sniffer length checks #9643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/sniffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2121,6 +2121,11 @@ static int CheckIp6Hdr(Ip6Hdr* iphdr, IpInfo* info, int length, char* error)
int version = IP_V(iphdr);
int exthdrsz = IP6_HDR_SZ;

if (length < IP6_HDR_SZ) {
SetError(BAD_IPVER_STR, error, NULL, 0);
return WOLFSSL_FATAL_ERROR;
}

TraceIP6(iphdr);
Trace(IP_CHECK_STR);

Expand Down Expand Up @@ -2175,6 +2180,11 @@ static int CheckIpHdr(IpHdr* iphdr, IpInfo* info, int length, char* error,
if (version == IPV6)
return CheckIp6Hdr((Ip6Hdr*)iphdr, info, length, error);

if (length < IP_HDR_SZ) {
SetError(PACKET_HDR_SHORT_STR, error, NULL, 0);
return WOLFSSL_FATAL_ERROR;
}

if (trace) {
TraceIP(iphdr);
Trace(IP_CHECK_STR);
Expand Down Expand Up @@ -5026,6 +5036,10 @@ static const byte* DecryptMessage(WOLFSSL* ssl, const byte* input, word32 sz,

#ifdef WOLFSSL_TLS13
if (IsAtLeastTLSv1_3(ssl->version)) {
if (sz < ssl->specs.aead_mac_size) {
*error = BUFFER_ERROR;
return NULL;
}
ret = DecryptTls13(ssl, output, input, sz, (byte*)rh, RECORD_HEADER_SZ);
}
else
Expand Down Expand Up @@ -5404,6 +5418,12 @@ static int CheckHeaders(IpInfo* ipInfo, TcpInfo* tcpInfo, const byte* packet,
/* trim VLAN header and try again */
packet += 8;
length -= 8;
if (length < IP_HDR_SZ) {
SetError(PACKET_HDR_SHORT_STR, error, NULL, 0);
return WOLFSSL_FATAL_ERROR;
}
iphdr = (IpHdr*)packet;
version = IP_V(iphdr);
}
}

Expand Down