|
 |
55db36 |
From 2b69156c43261ceae55eb4d3b644c4c2d73231ba Mon Sep 17 00:00:00 2001
|
|
|
55db36 |
Message-Id: <2b69156c43261ceae55eb4d3b644c4c2d73231ba.1531843216.git.erack@redhat.com>
|
|
|
55db36 |
From: David Tardon <dtardon@redhat.com>
|
|
|
55db36 |
Date: Tue, 6 Mar 2018 15:17:13 +0100
|
|
|
55db36 |
Subject: [PATCH] forcepoint: fix out-of-bounds read in ICU
|
|
|
55db36 |
MIME-Version: 1.0
|
|
|
55db36 |
Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
|
|
|
55db36 |
|
|
|
55db36 |
This is a multi-part message in MIME format.
|
|
|
55db36 |
--------------erAck-patch-parts
|
|
|
55db36 |
Content-Type: text/plain; charset=UTF-8; format=fixed
|
|
|
55db36 |
Content-Transfer-Encoding: 8bit
|
|
|
55db36 |
|
|
|
55db36 |
|
|
|
55db36 |
Change-Id: I5061d38d0e7df0de9a5c7574d522ce69934e4a24
|
|
|
55db36 |
---
|
|
|
55db36 |
external/icu/UnpackedTarball_icu.mk | 1 +
|
|
|
55db36 |
external/icu/ofz4860.patch.2 | 25 +++++++++++++++++++++++++
|
|
|
55db36 |
2 files changed, 26 insertions(+)
|
|
|
55db36 |
create mode 100644 external/icu/ofz4860.patch.2
|
|
|
55db36 |
|
|
|
55db36 |
|
|
|
55db36 |
--------------erAck-patch-parts
|
|
|
55db36 |
Content-Type: text/x-patch; name="0001-forcepoint-fix-out-of-bounds-read-in-ICU.patch"
|
|
|
55db36 |
Content-Transfer-Encoding: 8bit
|
|
|
55db36 |
Content-Disposition: attachment; filename="0001-forcepoint-fix-out-of-bounds-read-in-ICU.patch"
|
|
|
55db36 |
|
|
|
55db36 |
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
|
|
|
55db36 |
index 499650976a55..a4d0b16ecb36 100644
|
|
|
55db36 |
--- a/external/icu/UnpackedTarball_icu.mk
|
|
|
55db36 |
+++ b/external/icu/UnpackedTarball_icu.mk
|
|
|
55db36 |
@@ -35,6 +35,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
|
|
|
55db36 |
$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
|
|
|
55db36 |
external/icu/icu4c-khmerbreakengine.patch.1 \
|
|
|
55db36 |
external/icu/icu4c-59-werror-shadow.patch.1 \
|
|
|
55db36 |
+ external/icu/ofz4860.patch.2 \
|
|
|
55db36 |
))
|
|
|
55db36 |
|
|
|
55db36 |
$(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
|
|
|
55db36 |
diff --git a/external/icu/ofz4860.patch.2 b/external/icu/ofz4860.patch.2
|
|
|
55db36 |
new file mode 100644
|
|
|
55db36 |
index 000000000000..14114d52878b
|
|
|
55db36 |
--- /dev/null
|
|
|
55db36 |
+++ b/external/icu/ofz4860.patch.2
|
|
|
55db36 |
@@ -0,0 +1,25 @@
|
|
|
55db36 |
+From 529ba01ee606940ca273b187be8ce9ba31cf2d90 Mon Sep 17 00:00:00 2001
|
|
|
55db36 |
+From: David Tardon <dtardon@redhat.com>
|
|
|
55db36 |
+Date: Fri, 19 Jan 2018 10:41:02 +0100
|
|
|
55db36 |
+Subject: [PATCH] ofz#4860 fix past-the-end read from array
|
|
|
55db36 |
+
|
|
|
55db36 |
+---
|
|
|
55db36 |
+ icu4c/source/common/locmap.cpp | 2 +-
|
|
|
55db36 |
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
55db36 |
+
|
|
|
55db36 |
+diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp
|
|
|
55db36 |
+index cbb2b810a..6d62d8310 100644
|
|
|
55db36 |
+--- a/icu4c/source/common/locmap.cpp
|
|
|
55db36 |
++++ b/icu4c/source/common/locmap.cpp
|
|
|
55db36 |
+@@ -1015,7 +1015,7 @@ static const char*
|
|
|
55db36 |
+ getPosixID(const ILcidPosixMap *this_0, uint32_t hostID)
|
|
|
55db36 |
+ {
|
|
|
55db36 |
+ uint32_t i;
|
|
|
55db36 |
+- for (i = 0; i <= this_0->numRegions; i++)
|
|
|
55db36 |
++ for (i = 0; i < this_0->numRegions; i++)
|
|
|
55db36 |
+ {
|
|
|
55db36 |
+ if (this_0->regionMaps[i].hostID == hostID)
|
|
|
55db36 |
+ {
|
|
|
55db36 |
+--
|
|
|
55db36 |
+2.14.3
|
|
|
55db36 |
+
|
|
|
55db36 |
|
|
|
55db36 |
--------------erAck-patch-parts--
|
|
|
55db36 |
|
|
|
55db36 |
|