2383ee57 | 2015-03-09 16:38:56 | Slávek Banko |
Fix security issue CVE-2013-4549 [taken from RedHat Qt3 patches] (cherry picked from commit 73584365f8600414fc5a114ec2f2d6750a7f77cc) |
||
M src/xml/qxml.cpp M src/xml/qxml.h |
||
diff --git a/src/xml/qxml.cpp b/src/xml/qxml.cpp index 010389b..c786623 100644 --- a/src/xml/qxml.cpp +++ b/src/xml/qxml.cpp @@ -4529,6 +4529,11 @@ } break; case Mup: + if (dtdRecursionLimit > 0U && d->parameterEntities.size() > dtdRecursionLimit) { + reportParseError(QString::fromLatin1( + "DTD parsing exceeded recursion limit of %1.").arg(dtdRecursionLimit)); + return FALSE; + } if ( !parseMarkupdecl() ) { parseFailed( &QXmlSimpleReader::parseDoctype, state ); return FALSE; @@ -6128,6 +6133,58 @@ } } +bool QXmlSimpleReader::isExpandedEntityValueTooLarge(QString *errorMessage) +{ + QMap<QString, uint> literalEntitySizes; + // The entity at (QMap<QString,) referenced the entities at (QMap<QString,) (uint>) times. + QMap<QString, QMap<QString, uint> > referencesToOtherEntities; + QMap<QString, uint> expandedSizes; + + // For every entity, check how many times all entity names were referenced in its value. + QMap<QString,QString>::ConstIterator toSearchIterator; + for (toSearchIterator = d->entities.begin(); toSearchIterator != d->entities.end(); ++toSearchIterator) { + QString toSearch = toSearchIterator.key(); + // The amount of characters that weren't entity names, but literals, like 'X'. + QString leftOvers = toSearchIterator.data(); + QMap<QString,QString>::ConstIterator entityNameIterator; + // How many times was entityName referenced by toSearch? + for (entityNameIterator = d->entities.begin(); entityNameIterator != d->entities.end(); ++entityNameIterator) { + QString entityName = entityNameIterator.key(); + for (int i = 0; i >= 0 && (uint) i < leftOvers.length(); ) { + i = leftOvers.find(QString::fromLatin1("&%1;").arg(entityName), i); + if (i != -1) { + leftOvers.remove(i, entityName.length() + 2U); + // The entityName we're currently trying to find was matched in this string; increase our count. + ++referencesToOtherEntities[toSearch][entityName]; + } + } + } + literalEntitySizes[toSearch] = leftOvers.length(); + } + + QMap<QString, QMap<QString, uint> >::ConstIterator entityIterator; + for (entityIterator = referencesToOtherEntities.begin(); entityIterator != referencesToOtherEntities.end(); ++entityIterator) { + QString entity = entityIterator.key(); + expandedSizes[entity] = literalEntitySizes[entity]; + QMap<QString, uint>::ConstIterator referenceToIterator; + for (referenceToIterator = entityIterator.data().begin(); referenceToIterator != entityIterator.data().end(); ++referenceToIterator) { + QString referenceTo = referenceToIterator.key(); + const uint references = referenceToIterator.data(); + // The total size of an entity's value is the expanded size of all of its referenced entities, plus its literal size. + expandedSizes[entity] += expandedSizes[referenceTo] * references + literalEntitySizes[referenceTo] * references; + } + + if (expandedSizes[entity] > entityCharacterLimit) { + if (errorMessage) { + *errorMessage = QString::fromLatin1("The XML entity \"%1\" expands to a string that is too large to process (%2 characters > %3)."); + *errorMessage = (*errorMessage).arg(entity).arg(expandedSizes[entity]).arg(entityCharacterLimit); + } + return TRUE; + } + } + return FALSE; +} + /* Parse a EntityDecl [70]. @@ -6222,6 +6279,12 @@ switch ( state ) { case EValue: if ( !entityExist( name() ) ) { + QString errorMessage; + if (isExpandedEntityValueTooLarge(&errorMessage)) { + reportParseError(errorMessage); + return FALSE; + } + d->entities.insert( name(), string() ); if ( declHnd ) { if ( !declHnd->internalEntityDecl( name(), string() ) ) { diff --git a/src/xml/qxml.h b/src/xml/qxml.h index 11fbbdb..6d0bee8 100644 --- a/src/xml/qxml.h +++ b/src/xml/qxml.h @@ -307,6 +307,12 @@ QXmlSimpleReaderPrivate* d; + // The limit to the amount of times the DTD parsing functions can be called + // for the DTD currently being parsed. + static const uint dtdRecursionLimit = 2U; + // The maximum amount of characters an entity value may contain, after expansion. + static const uint entityCharacterLimit = 65536U; + const QString &string(); void stringClear(); inline void stringAddC() { stringAddC(c); } @@ -378,6 +384,7 @@ void unexpectedEof( ParseFunction where, int state ); void parseFailed( ParseFunction where, int state ); void pushParseState( ParseFunction function, int state ); + bool isExpandedEntityValueTooLarge(QString *errorMessage); void setUndefEntityInAttrHack(bool b); |
||
5184b53b | 2015-03-09 16:38:57 | Slávek Banko |
Fix security issue CVE-2014-0190 [taken from RedHat Qt3 patches] (cherry picked from commit ad74a11abf9d62389a6bd74a6edf9cd73e36c8f7) |
||
M src/kernel/qasyncimageio.cpp |
||
diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp index 8ecd1eb..e16125b 100644 --- a/src/kernel/qasyncimageio.cpp +++ b/src/kernel/qasyncimageio.cpp @@ -904,7 +904,12 @@ sheight = newtop + newheight; if (img.isNull()) { - img.create(swidth, sheight, 32); + if (!img.create(swidth, sheight, 32)) { + // Check if the attempt to create the image failed. If + // it did, the image is broken and we should give up. + state = Error; + return -1; + } memset( img.bits(), 0, img.numBytes() ); if (consumer) consumer->setSize(swidth, sheight); } |
||
a0008cd7 | 2015-03-09 16:38:58 | Slávek Banko |
Fix security issue CVE-2015-0295 [taken from RedHat Qt3 patches] (cherry picked from commit b3037160f25730efca66966559779559a4946bf3) |
||
M src/kernel/qimage.cpp |
||
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp index 4c489d2..60a9a5d 100644 --- a/src/kernel/qimage.cpp +++ b/src/kernel/qimage.cpp @@ -4716,10 +4716,16 @@ if ( (Q_ULONG)d->readBlock( (char *)&blue_mask, sizeof(blue_mask) ) != sizeof(blue_mask) ) return FALSE; red_shift = calc_shift(red_mask); + if (((red_mask >> red_shift) + 1) == 0) + return FALSE; red_scale = 256 / ((red_mask >> red_shift) + 1); green_shift = calc_shift(green_mask); + if (((green_mask >> green_shift) + 1) == 0) + return FALSE; green_scale = 256 / ((green_mask >> green_shift) + 1); blue_shift = calc_shift(blue_mask); + if (((blue_mask >> blue_shift) + 1) == 0) + return FALSE; blue_scale = 256 / ((blue_mask >> blue_shift) + 1); } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { blue_mask = 0x000000ff; |