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

Fix undefined behavior in FTP analyzer's parse_port method

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-05-05 17:56:32 -07:00
parent 8596671dd5
commit c0b09665b9
1 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/analyzer/protocol/ftp/functions.bif
View file

@ -8,42 +8,36 @@ static zeek::RecordValPtr parse_port(std::string_view line)
{ {
auto r = zeek::make_intrusive<zeek::RecordVal>(zeek::BifType::Record::ftp_port); auto r = zeek::make_intrusive<zeek::RecordVal>(zeek::BifType::Record::ftp_port);
bool good = false;
uint32_t port = 0;
uint32_t addr = 0;
int32_t bytes[6]; int32_t bytes[6];
if ( line.size() >= 11 && sscanf(line.data(), if ( line.size() >= 11 && sscanf(line.data(),
"%" SCNd32 ",%" SCNd32 ",%" SCNd32 ",%" SCNd32 ",%" SCNd32 ",%" SCNd32, "%" SCNd32 ",%" SCNd32 ",%" SCNd32 ",%" SCNd32 ",%" SCNd32 ",%" SCNd32,
&bytes[0], &bytes[1], &bytes[2], &bytes[0], &bytes[1], &bytes[2],
&bytes[3], &bytes[4], &bytes[5]) == 6 ) &bytes[3], &bytes[4], &bytes[5]) == 6 )
{ {
int good = 1; good = true;
for ( int i = 0; i < 6; ++i ) for ( int i = 0; i < 6; ++i )
if ( bytes[i] < 0 || bytes[i] > 255 ) if ( bytes[i] < 0 || bytes[i] > 255 )
{ {
good = 0; good = false;
break; break;
} }
uint32_t addr = (bytes[0] << 24) | (bytes[1] << 16) | if ( good )
(bytes[2] << 8) | bytes[3];
uint32_t port = (bytes[4] << 8) | bytes[5];
// Since port is unsigned, no need to check for < 0.
if ( port > 65535 )
{ {
port = 0; addr = (bytes[0] << 24) | (bytes[1] << 16) |
good = 0; (bytes[2] << 8) | bytes[3];
port = (bytes[4] << 8) | bytes[5];
} }
}
r->Assign(0, zeek::make_intrusive<zeek::AddrVal>(htonl(addr))); r->Assign(0, zeek::make_intrusive<zeek::AddrVal>(htonl(addr)));
r->Assign(1, zeek::val_mgr->Port(port, TRANSPORT_TCP)); r->Assign(1, zeek::val_mgr->Port(port, TRANSPORT_TCP));
r->Assign(2, good); r->Assign(2, good);
}
else
{
r->Assign(0, zeek::make_intrusive<zeek::AddrVal>(uint32_t(0)));
r->Assign(1, zeek::val_mgr->Port(0, TRANSPORT_TCP));
r->Assign(2, false);
}
return r; return r;
} }