diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-18 08:52:17 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-19 22:51:04 -0800 |
| commit | 3b49aa72fe6ec0dd0aa0c1c41fb81e874dc789fa (patch) | |
| tree | fadd20c349817ab7d33ad167a86beed15bfe3773 /src/corelib/plugin/qcoffpeparser.cpp | |
| parent | 892d5607d0b1c9e010ea10a1123e68741c46c21e (diff) | |
Q{CoffPe,Elf,MachO}Parser: check that the magic string is present
Commit 2549a88ba2a48fa2bedce97dd71a2974c6f8840a changed the ELF and
Mach-O parsers to return an offset to the actual data header, not the
magic string, which we stopped searching for anyway. This commit brings
such a validity check back and adds it to the new COFF PE parser.
Change-Id: Iccb47e5527544b6fbd75fffd16b8b2252a76f179
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/plugin/qcoffpeparser.cpp')
| -rw-r--r-- | src/corelib/plugin/qcoffpeparser.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/corelib/plugin/qcoffpeparser.cpp b/src/corelib/plugin/qcoffpeparser.cpp index 4bd0a5516f4..f258ef5de2e 100644 --- a/src/corelib/plugin/qcoffpeparser.cpp +++ b/src/corelib/plugin/qcoffpeparser.cpp @@ -396,15 +396,20 @@ QLibraryScanResult QCoffPeParser::parse(QByteArrayView data, QString *errMsg) continue; peDebug << "found .qtmetadata section"; + size_t size = qMin(section->SizeOfRawData, section->Misc.VirtualSize); + if (size < sizeof(QPluginMetaData::MagicHeader)) + return error(QLibrary::tr(".qtmetadata section is too small")); if (IncludeValidityChecks) { + QByteArrayView expectedMagic = QByteArrayView::fromArray(QPluginMetaData::MagicString); + QByteArrayView actualMagic = data.sliced(offset, expectedMagic.size()); + if (expectedMagic != actualMagic) + return error(QLibrary::tr(".qtmetadata section has incorrect magic")); + if (section->Characteristics & IMAGE_SCN_MEM_WRITE) return error(QLibrary::tr(".qtmetadata section is writable")); if (section->Characteristics & IMAGE_SCN_MEM_EXECUTE) return error(QLibrary::tr(".qtmetadata section is executable")); } - size_t size = qMin(section->SizeOfRawData, section->Misc.VirtualSize); - if (size < sizeof(QPluginMetaData::MagicHeader)) - return error(QLibrary::tr("section .qtmetadata is too small")); return { qsizetype(offset + sizeof(QPluginMetaData::MagicString)), qsizetype(size - sizeof(QPluginMetaData::MagicString)) }; |