Skip to content
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

Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=64190 #1240

Merged
merged 3 commits into from
Nov 22, 2023
Merged

Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=64190 #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d152bb2
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=64190
sashashura Nov 15, 2023
964c7cd
Extend countOptions
sashashura Nov 18, 2023
1d41bff
User reference
sashashura Nov 21, 2023
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
3 changes: 2 additions & 1 deletion Packet++/header/SomeIpSdLayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,14 +761,15 @@ class SomeIpSdLayer : public SomeIpLayer

uint32_t m_NumOptions;

uint32_t countOptions();
static bool countOptions(uint32_t& count, const uint8_t* data);
uint32_t findOption(const SomeIpSdOption &option);
void addOption(const SomeIpSdOption &option);
bool addOptionIndex(uint32_t indexEntry, uint32_t indexOffset);
OptionPtr parseOption(SomeIpSdOption::OptionType type, size_t offset) const;

static size_t getLenEntries(const uint8_t* data);
size_t getLenEntries() const;
static size_t getLenOptions(const uint8_t* data);
size_t getLenOptions() const;
void setLenEntries(uint32_t length);
void setLenOptions(uint32_t length);
Expand Down
33 changes: 23 additions & 10 deletions Packet++/src/SomeIpSdLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ void SomeIpSdEntry::initStdFields(EntryType type, uint16_t serviceID, uint16_t i
SomeIpSdLayer::SomeIpSdLayer(uint8_t *data, size_t dataLen, Layer *prevLayer, Packet *packet)
: SomeIpLayer(data, dataLen, prevLayer, packet)
{
m_NumOptions = countOptions();
countOptions(m_NumOptions, data);
}

SomeIpSdLayer::SomeIpSdLayer(uint16_t serviceID, uint16_t methodID, uint16_t clientID, uint16_t sessionID,
Expand Down Expand Up @@ -633,31 +633,39 @@ uint32_t SomeIpSdLayer::addEntry(const SomeIpSdEntry &entry)

bool SomeIpSdLayer::isDataValid(const uint8_t* data, size_t dataLen)
{
uint32_t count;
if (!data ||
dataLen < sizeof(someipsdhdr) + sizeof(uint32_t) ||
dataLen < sizeof(someipsdhdr) + sizeof(uint32_t) + getLenEntries(data) + sizeof(uint32_t) ||
dataLen < be32toh(*((uint32_t *)(data + sizeof(someipsdhdr) + sizeof(uint32_t) + getLenEntries(data)))))
dataLen < sizeof(someipsdhdr) + sizeof(uint32_t) + getLenEntries(data) + sizeof(uint32_t) + getLenOptions(data) ||
!countOptions(count, data))
{
return false;
}

return true;
}

uint32_t SomeIpSdLayer::countOptions()
bool SomeIpSdLayer::countOptions(uint32_t& count, const uint8_t* data)
{
size_t offsetOption = sizeof(someipsdhdr) + sizeof(uint32_t) + getLenEntries() + sizeof(uint32_t);
size_t lenOptions = getLenOptions();
size_t offsetOption = sizeof(someipsdhdr) + sizeof(uint32_t) + getLenEntries(data) + sizeof(uint32_t);
size_t lenOptions = getLenOptions(data);
uint32_t len = 0;

uint32_t numOptions = 0;
count = 0;
while (len < lenOptions)
{
uint32_t lenOption = be16toh(*((uint16_t *)(m_Data + offsetOption + len))) + 3 * sizeof(uint8_t);
if (len + sizeof(uint16_t) + 3 * sizeof(uint8_t) > lenOptions)
return false;

uint32_t lenOption = be16toh(*((uint16_t *)(data + offsetOption + len))) + 3 * sizeof(uint8_t);
len += lenOption;
++numOptions;
if (len > lenOptions) // the last one must be equal to lenOptions
return false;

++(count);
}
return numOptions;
return true;
}

uint32_t SomeIpSdLayer::findOption(const SomeIpSdOption &option)
Expand Down Expand Up @@ -791,7 +799,12 @@ size_t SomeIpSdLayer::getLenEntries(const uint8_t* data)

size_t SomeIpSdLayer::getLenOptions() const
{
return be32toh(*((uint32_t *)(m_Data + sizeof(someipsdhdr) + sizeof(uint32_t) + getLenEntries())));
return getLenOptions(m_Data);
}

size_t SomeIpSdLayer::getLenOptions(const uint8_t* data)
{
return be32toh(*((uint32_t *)(data + sizeof(someipsdhdr) + sizeof(uint32_t) + getLenEntries(data))));
}

void SomeIpSdLayer::setLenEntries(uint32_t length)
Expand Down