Skip to content

CodeQL Fix OOB reads in SectionAIEResourcesBin #9961

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

Closed
stsoe wants to merge 1 commit into from
+16 −5
Closed

CodeQL Fix OOB reads in SectionAIEResourcesBin #9961

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
21 changes: 16 additions & 5 deletions src/runtime_src/tools/xclbinutil/SectionAIEResourcesBin.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ SectionAIEResourcesBin::copyBufferUpdateMetadata(const char* _pOrigDataSection,

// mpo_name
{
auto sDefault = reinterpret_cast<const char*>(pHdr) + sizeof(aie_resources_bin) + pHdr->mpo_name;
auto sDefault = XUtil::bounded_mpo_cstr(pHdr, pHdr->mpo_name, _origSectionSize);
auto sValue = ptSK.get<std::string>("name", sDefault);

if (sValue.compare(getSectionIndexName()) != 0) {
Expand All @@ -215,7 +215,7 @@ SectionAIEResourcesBin::copyBufferUpdateMetadata(const char* _pOrigDataSection,

// mpo_version
{
auto sDefault = reinterpret_cast<const char*>(pHdr) + sizeof(aie_resources_bin) + pHdr->mpo_version;
auto sDefault = XUtil::bounded_mpo_cstr(pHdr, pHdr->mpo_version, _origSectionSize);
auto sValue = ptSK.get<std::string>("version", sDefault);
aieResourcesBinHdr.mpo_version = sizeof(aie_resources_bin) + stringBlock.tellp();
stringBlock << sValue << '\0';
Expand All @@ -224,7 +224,7 @@ SectionAIEResourcesBin::copyBufferUpdateMetadata(const char* _pOrigDataSection,

// m_start_column
{
auto sDefault = reinterpret_cast<const char*>(pHdr) + sizeof(aie_resources_bin) + pHdr->m_start_column;
auto sDefault = XUtil::bounded_mpo_cstr(pHdr, pHdr->m_start_column, _origSectionSize);
auto sValue = ptSK.get<std::string>("start_column", sDefault);
aieResourcesBinHdr.m_start_column = sizeof(aie_resources_bin) + stringBlock.tellp();
stringBlock << sValue << '\0';
Expand All @@ -233,7 +233,7 @@ SectionAIEResourcesBin::copyBufferUpdateMetadata(const char* _pOrigDataSection,

// m_num_columns
{
auto sDefault = reinterpret_cast<const char*>(pHdr) + sizeof(aie_resources_bin) + pHdr->m_num_columns;
auto sDefault = XUtil::bounded_mpo_cstr(pHdr, pHdr->m_num_columns, _origSectionSize);
auto sValue = ptSK.get<std::string>("num_columns", sDefault);
aieResourcesBinHdr.m_num_columns = sizeof(aie_resources_bin) + stringBlock.tellp();
stringBlock << sValue << '\0';
Expand All @@ -257,7 +257,12 @@ SectionAIEResourcesBin::copyBufferUpdateMetadata(const char* _pOrigDataSection,
std::string sStringBlock = stringBlock.str();
_buffer.write(sStringBlock.c_str(), sStringBlock.size());

// Image
// Image — validate offset+size against the original section before reading
{
uint64_t img_end = static_cast<uint64_t>(pHdr->m_image_offset) + pHdr->m_image_size;
if (img_end > _origSectionSize)
throw std::runtime_error("aie_resources_bin m_image_offset/m_image_size out of bounds");
}
_buffer.write(reinterpret_cast<const char*>(pHdr) + pHdr->m_image_offset, pHdr->m_image_size);
}

Expand Down Expand Up @@ -383,6 +388,12 @@ SectionAIEResourcesBin::writeObjImage(std::ostream& _oStream) const
// No look at the data
auto pHdr = reinterpret_cast<aie_resources_bin*>(m_pBuffer);

{
uint64_t img_end = static_cast<uint64_t>(pHdr->m_image_offset) + pHdr->m_image_size;
if (img_end > m_bufferSize)
throw std::runtime_error("aie_resources_bin m_image_offset/m_image_size out of bounds");
}

auto pFWBuffer = reinterpret_cast<const char*>(pHdr) + pHdr->m_image_offset;
_oStream.write(pFWBuffer, pHdr->m_image_size);
}
Expand Down
Loading