diff options
author | Jonathan Liu <net147@gmail.com> | 2015-03-02 17:47:46 +1100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-20 20:54:32 +0100 |
commit | 3054c7344532513692f561db5b1181840af96a9e (patch) | |
tree | be494cf2466e7251273724c029ee2d406b5dbf24 /meta | |
parent | c5a583e8bdcd1f66ae1305eb24be13d6cdb2842c (diff) | |
download | poky-3054c7344532513692f561db5b1181840af96a9e.tar.gz |
qt4: add patch for BMP denial-of-service vulnerability
did not include aarch64 patches.
For further details, see:
https://bugreports.qt.io/browse/QTBUG-44547
(From OE-Core rev: 840fccf8ec7691f03deeb167487cde941ebea8bf)
(From OE-Core rev: c050f01d56c1eaf747ebb471b0b726b9cb3794d8)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Conflicts:
meta/recipes-qt/qt4/qt4-4.8.6.inc
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.6.inc | 1 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch | 44 |
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6.inc b/meta/recipes-qt/qt4/qt4-4.8.6.inc index ae6692b50a..31342142c7 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.6.inc +++ b/meta/recipes-qt/qt4/qt4-4.8.6.inc | |||
@@ -22,6 +22,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever | |||
22 | file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ | 22 | file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ |
23 | file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ | 23 | file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ |
24 | file://0028-Don-t-crash-on-broken-GIF-images.patch \ | 24 | file://0028-Don-t-crash-on-broken-GIF-images.patch \ |
25 | file://0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch \ | ||
25 | file://g++.conf \ | 26 | file://g++.conf \ |
26 | file://linux.conf \ | 27 | file://linux.conf \ |
27 | " | 28 | " |
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch new file mode 100644 index 0000000000..8ff4ad5062 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From e50aa2252cdd5cb53eef7d8c4503c7edff634f68 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Richard J. Moore" <rich@kde.org> | ||
3 | Date: Tue, 24 Feb 2015 19:02:35 +0000 | ||
4 | Subject: [PATCH] Fix a division by zero when processing malformed BMP files. | ||
5 | |||
6 | This fixes a division by 0 when processing a maliciously crafted BMP | ||
7 | file. No impact beyond DoS. | ||
8 | |||
9 | Backport of 661f6bfd032dacc62841037732816a583640e187 | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | |||
13 | Task-number: QTBUG-44547 | ||
14 | Change-Id: I43f06e752b11cb50669101460902a82b885ae618 | ||
15 | Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | ||
16 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
17 | --- | ||
18 | src/gui/image/qbmphandler.cpp | 6 ++++++ | ||
19 | 1 file changed, 6 insertions(+) | ||
20 | |||
21 | diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp | ||
22 | index b22e842..30fa9e0 100644 | ||
23 | --- a/src/gui/image/qbmphandler.cpp | ||
24 | +++ b/src/gui/image/qbmphandler.cpp | ||
25 | @@ -319,10 +319,16 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int | ||
26 | } | ||
27 | } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { | ||
28 | red_shift = calc_shift(red_mask); | ||
29 | + if (((red_mask >> red_shift) + 1) == 0) | ||
30 | + return false; | ||
31 | red_scale = 256 / ((red_mask >> red_shift) + 1); | ||
32 | green_shift = calc_shift(green_mask); | ||
33 | + if (((green_mask >> green_shift) + 1) == 0) | ||
34 | + return false; | ||
35 | green_scale = 256 / ((green_mask >> green_shift) + 1); | ||
36 | blue_shift = calc_shift(blue_mask); | ||
37 | + if (((blue_mask >> blue_shift) + 1) == 0) | ||
38 | + return false; | ||
39 | blue_scale = 256 / ((blue_mask >> blue_shift) + 1); | ||
40 | } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { | ||
41 | blue_mask = 0x000000ff; | ||
42 | -- | ||
43 | 2.3.1 | ||
44 | |||