qt4: add patch for BMP denial-of-service vulnerability
For further details, see: https://bugreports.qt.io/browse/QTBUG-44547 (From OE-Core rev: 840fccf8ec7691f03deeb167487cde941ebea8bf) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
73be8c1825
commit
21e2c03a00
|
@ -26,6 +26,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
|
||||||
file://0030-aarch64_arm64_qatomic_support.patch \
|
file://0030-aarch64_arm64_qatomic_support.patch \
|
||||||
file://0031-aarch64_arm64_mkspecs.patch \
|
file://0031-aarch64_arm64_mkspecs.patch \
|
||||||
file://0032-aarch64_add_header.patch \
|
file://0032-aarch64_add_header.patch \
|
||||||
|
file://0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch \
|
||||||
file://Fix-QWSLock-invalid-argument-logs.patch \
|
file://Fix-QWSLock-invalid-argument-logs.patch \
|
||||||
file://g++.conf \
|
file://g++.conf \
|
||||||
file://linux.conf \
|
file://linux.conf \
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
From e50aa2252cdd5cb53eef7d8c4503c7edff634f68 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Richard J. Moore" <rich@kde.org>
|
||||||
|
Date: Tue, 24 Feb 2015 19:02:35 +0000
|
||||||
|
Subject: [PATCH] Fix a division by zero when processing malformed BMP files.
|
||||||
|
|
||||||
|
This fixes a division by 0 when processing a maliciously crafted BMP
|
||||||
|
file. No impact beyond DoS.
|
||||||
|
|
||||||
|
Backport of 661f6bfd032dacc62841037732816a583640e187
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
|
||||||
|
Task-number: QTBUG-44547
|
||||||
|
Change-Id: I43f06e752b11cb50669101460902a82b885ae618
|
||||||
|
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||||
|
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||||
|
---
|
||||||
|
src/gui/image/qbmphandler.cpp | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
|
||||||
|
index b22e842..30fa9e0 100644
|
||||||
|
--- a/src/gui/image/qbmphandler.cpp
|
||||||
|
+++ b/src/gui/image/qbmphandler.cpp
|
||||||
|
@@ -319,10 +319,16 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
|
||||||
|
}
|
||||||
|
} else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
|
||||||
|
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;
|
||||||
|
--
|
||||||
|
2.3.1
|
||||||
|
|
Loading…
Reference in New Issue