Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/ieee-80211-length-check'

Browse source 
* origin/topic/timw/ieee-80211-length-check:
  Add additional length check to IEEE 802.11 analyzer
This commit is contained in:
Tim Wojtulewicz 2023-05-03 09:30:55 -07:00
commit bc82b657c4
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
6.0.0-dev.487 | 2023-05-03 09:30:55 -0700
* Add additional length check to IEEE 802.11 analyzer (Tim Wojtulewicz, Corelight)
6.0.0-dev.484 | 2023-05-03 14:18:03 +0100 6.0.0-dev.484 | 2023-05-03 14:18:03 +0100
* SSL: do not try to disable failed analyzer (Johanna Amann, Corelight) * SSL: do not try to disable failed analyzer (Johanna Amann, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.484 6.0.0-dev.487

6
src/packet_analysis/protocol/ieee802_11/IEEE802_11.cc
View file

@ -31,6 +31,12 @@ bool IEEE802_11Analyzer::AnalyzePacket(size_t len, const uint8_t* data, Packet*
if ( (data[1] & 0x03) == 0x03 ) if ( (data[1] & 0x03) == 0x03 )
len_80211 += packet->L2_ADDR_LEN; len_80211 += packet->L2_ADDR_LEN;
if ( len_80211 >= len )
{
Weird("truncated_802_11_header", packet);
return false;
}
// Look for the QoS indicator bit. // Look for the QoS indicator bit.
if ( (fc_80211 >> 4) & 0x08 ) if ( (fc_80211 >> 4) & 0x08 )
{ {