diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 20:58:35 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-03-01 15:00:08 +0100 |
| commit | f072467269f6cd0966008e58dd58974f69615d12 (patch) | |
| tree | ce043d0d251376a9a2ce09f93c873921dc9534fd | |
| parent | ca1042b8feb8cac2ac1ca835ac67d0ad6d373d0c (diff) | |
qtbase: fix security issue in processing BMP files
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase/0014-Fix-a-division-by-zero-when-processing-malformed-BMP.patch | 47 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_5.4.1.bb | 1 |
2 files changed, 48 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0014-Fix-a-division-by-zero-when-processing-malformed-BMP.patch b/recipes-qt/qt5/qtbase/0014-Fix-a-division-by-zero-when-processing-malformed-BMP.patch new file mode 100644 index 00000000..42159ef4 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0014-Fix-a-division-by-zero-when-processing-malformed-BMP.patch @@ -0,0 +1,47 @@ +From a343de8e9b85b98f18446d045afbf6f1d3f6c5b4 Mon Sep 17 00:00:00 2001 +From: "Richard J. Moore" <rich@kde.org> +Date: Sat, 21 Feb 2015 17:43:21 +0000 +Subject: [PATCH 14/14] 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. + +Upstream-Status: Backport from 5.4 branch + +Task-number: QTBUG-44547 +Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973 +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> +--- + src/gui/image/qbmphandler.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp +index 21c1a2f..df66499 100644 +--- a/src/gui/image/qbmphandler.cpp ++++ b/src/gui/image/qbmphandler.cpp +@@ -314,12 +314,20 @@ 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); + alpha_shift = calc_shift(alpha_mask); ++ if (((alpha_mask >> alpha_shift) + 1) == 0) ++ return false; + alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1); + } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { + blue_mask = 0x000000ff; +-- +2.3.1 + diff --git a/recipes-qt/qt5/qtbase_5.4.1.bb b/recipes-qt/qt5/qtbase_5.4.1.bb index fed9df46..0ff611f1 100644 --- a/recipes-qt/qt5/qtbase_5.4.1.bb +++ b/recipes-qt/qt5/qtbase_5.4.1.bb @@ -4,6 +4,7 @@ require ${PN}.inc # This patch is in 5.4 branch but didn't make it into 5.4.1 release SRC_URI += "\ file://0013-Fix-build-of-egl-integration.patch \ + file://0014-Fix-a-division-by-zero-when-processing-malformed-BMP.patch \ " SRC_URI[md5sum] = "9507825e558c980fed602de1f16ec7ae" |