blob: a3f75992767b9f45b8d13c63880c79a568f2a553 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001Backport patch to fix CVE-2017-17821. Refer to
2https://security-tracker.debian.org/tracker/CVE-2017-17821.
3
4Upstream-Status: Backport [https://trac.webkit.org/changeset/232119/webkit]
5CVE: CVE-2017-17821
6
7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8
9From 2a17b15297eb886b0bfb7d098ef607cfad6c3da0 Mon Sep 17 00:00:00 2001
10From: "mcatanzaro@igalia.com"
11 <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
12Date: Wed, 23 May 2018 17:54:01 +0000
13Subject: [PATCH] Prohibit shrinking the FastBitVector
14 https://bugs.webkit.org/show_bug.cgi?id=181020
15
16Reviewed by Oliver Hunt.
17
18Prohibit shrinking the FastBitVector. It's not prepared for this and the current usage does
19not require it.
20
21* wtf/FastBitVector.cpp:
22(WTF::FastBitVectorWordOwner::resizeSlow):
23
24git-svn-id: http://svn.webkit.org/repository/webkit/trunk@232119 268f45cc-cd09-0410-ab3c-d52691b4dbfc
25---
26 Source/WTF/wtf/FastBitVector.cpp | 2 ++
27 2 files changed, 15 insertions(+)
28
29diff --git a/Source/WTF/wtf/FastBitVector.cpp b/Source/WTF/wtf/FastBitVector.cpp
30index eed316975f4..8b019aaa3ed 100644
31--- a/Source/WTF/wtf/FastBitVector.cpp
32+++ b/Source/WTF/wtf/FastBitVector.cpp
33@@ -42,6 +42,8 @@ void FastBitVectorWordOwner::setEqualsSlow(const FastBitVectorWordOwner& other)
34 void FastBitVectorWordOwner::resizeSlow(size_t numBits)
35 {
36 size_t newLength = fastBitVectorArrayLength(numBits);
37+
38+ RELEASE_ASSERT(newLength >= arrayLength());
39
40 // Use fastCalloc instead of fastRealloc because we expect the common
41 // use case for this method to be initializing the size of the bitvector.
42--
432.17.0
44