Skip to content

bound capwap decap reads to caplen in dissectPacket #10487

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

Open
uwezkhan wants to merge 1 commit into
base: dev
Choose a base branch
from
+9 −1
Open

bound capwap decap reads to caplen in dissectPacket #10487

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
10 changes: 9 additions & 1 deletion src/NetworkInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3417,11 +3417,19 @@ bool NetworkInterface::dissectPacket(
*/
u_short eth_type;
ip_offset = ip_offset + ip_len + sizeof(struct ndpi_udphdr);

if ((ip_offset + 1) >= h->caplen) {
incStats(ingressPacket, h->ts.tv_sec, 0, NDPI_PROTOCOL_UNKNOWN,
NDPI_PROTOCOL_CATEGORY_UNSPECIFIED, 0, len_on_wire, 1,
NULL /* srcMac */, NULL /* dstMac */);
goto dissect_packet_end;
}

u_int8_t capwap_header_len =
((*(u_int8_t*)&packet[ip_offset + 1]) >> 3) * 4;
ip_offset = ip_offset + capwap_header_len + 24 + 8;

if (ip_offset >= h->len) {
if (ip_offset >= h->caplen) {
incStats(ingressPacket, h->ts.tv_sec, 0, NDPI_PROTOCOL_UNKNOWN,
NDPI_PROTOCOL_CATEGORY_UNSPECIFIED, 0, len_on_wire, 1,
NULL /* srcMac */, NULL /* dstMac */);
Expand Down
Loading