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/qmachparser.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/qmachparser.cpp')
| -rw-r--r-- | src/corelib/plugin/qmachparser.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/corelib/plugin/qmachparser.cpp b/src/corelib/plugin/qmachparser.cpp index f864f2610ea..310d8e06c3d 100644 --- a/src/corelib/plugin/qmachparser.cpp +++ b/src/corelib/plugin/qmachparser.cpp @@ -46,6 +46,10 @@ QT_BEGIN_NAMESPACE +// Whether we include some extra validity checks +// (checks to ensure we don't read out-of-bounds are always included) +static constexpr bool IncludeValidityChecks = true; + #if defined(Q_PROCESSOR_X86_64) # define MACHO64 static const cpu_type_t my_cputype = CPU_TYPE_X86_64; @@ -193,9 +197,16 @@ QLibraryScanResult QMachOParser::parse(const char *m_s, ulong fdlen, QString *e return notfound(QString(), errorString); if (sect[j].size < sizeof(QPluginMetaData::MagicHeader)) - return notfound(QLibrary::tr("section .qtmetadata is too small"), errorString); + return notfound(QLibrary::tr(".qtmetadata section is too small"), errorString); qsizetype pos = reinterpret_cast<const char *>(header) - m_s + sect[j].offset; + if (IncludeValidityChecks) { + QByteArrayView expectedMagic = QByteArrayView::fromArray(QPluginMetaData::MagicString); + QByteArrayView actualMagic = QByteArrayView(m_s + pos, expectedMagic.size()); + if (expectedMagic != actualMagic) + return notfound(QLibrary::tr(".qtmetadata section has incorrect magic"), errorString); + } + pos += sizeof(QPluginMetaData::MagicString); return { pos, qsizetype(sect[j].size - sizeof(QPluginMetaData::MagicString)) }; } |