mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 18:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

webkit: 2.20.3 -> 2.20.5

Browse Source 
Upgrade webkitgtk from 2.20.3 to 2.20.5.

* include fix of CVE-2018-12911
* backport patch for fix CVE-2017-17821

(From OE-Core rev: b77193ca8fd362d7b711574aa0b6eb07f7cc605f)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang
2018-08-31 23:02:42 +08:00
committed by Richard Purdie
parent 675d372205
commit 92397ad593
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
meta/recipes-sato/webkit/webkitgtk/0001-webkitgtk-fix-CVE-2017-17821.patch Normal file
View File

@@ -0,0 +1,44 @@
Backport patch to fix CVE-2017-17821. Refer to
https://security-tracker.debian.org/tracker/CVE-2017-17821.
Upstream-Status: Backport [https://trac.webkit.org/changeset/232119/webkit]
CVE: CVE-2017-17821
Signed-off-by: Kai Kang <kai.kang@windriver.com>
From 2a17b15297eb886b0bfb7d098ef607cfad6c3da0 Mon Sep 17 00:00:00 2001
From: "mcatanzaro@igalia.com"
<mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 23 May 2018 17:54:01 +0000
Subject: [PATCH] Prohibit shrinking the FastBitVector
https://bugs.webkit.org/show_bug.cgi?id=181020
Reviewed by Oliver Hunt.
Prohibit shrinking the FastBitVector. It's not prepared for this and the current usage does
not require it.
* wtf/FastBitVector.cpp:
(WTF::FastBitVectorWordOwner::resizeSlow):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@232119 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
Source/WTF/wtf/FastBitVector.cpp | 2 ++
2 files changed, 15 insertions(+)
diff --git a/Source/WTF/wtf/FastBitVector.cpp b/Source/WTF/wtf/FastBitVector.cpp
index eed316975f4..8b019aaa3ed 100644
--- a/Source/WTF/wtf/FastBitVector.cpp
+++ b/Source/WTF/wtf/FastBitVector.cpp
@@ -42,6 +42,8 @@ void FastBitVectorWordOwner::setEqualsSlow(const FastBitVectorWordOwner& other)
void FastBitVectorWordOwner::resizeSlow(size_t numBits)
{
size_t newLength = fastBitVectorArrayLength(numBits);
+
+ RELEASE_ASSERT(newLength >= arrayLength());
// Use fastCalloc instead of fastRealloc because we expect the common
// use case for this method to be initializing the size of the bitvector.
--
2.17.0

5
meta/recipes-sato/webkit/webkitgtk_2.20.3.bb → meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
View File

@@ -22,10 +22,11 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://detect-gstreamer-gl.patch \
file://0012-soup-Forward-declare-URL-class.patch \
file://0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch \
file://0001-webkitgtk-fix-CVE-2017-17821.patch \
"
SRC_URI[md5sum] = "efb69a0cc3cc67ef2647efec22e44c69"
SRC_URI[sha256sum] = "579b307d78fa16a73f112790178022166d7ad17d4147492ced9b9fba48f20dd8"
SRC_URI[md5sum] = "72a05f6a4dc1c78b079590a8fd280401"
SRC_URI[sha256sum] = "15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac3af990"
inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc