diff options
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/CVE-2020-13753.patch | 15 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.28.3.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.28.2.bb) | 4 |
2 files changed, 1 insertions, 18 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/CVE-2020-13753.patch b/meta/recipes-sato/webkit/webkitgtk/CVE-2020-13753.patch deleted file mode 100644 index d8504c2b36..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/CVE-2020-13753.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Backport [https://trac.webkit.org/changeset/262368/webkit?format=diff&new=262368] -CVE: CVE-2020-13753 -Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> - -Index: a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp -=================================================================== ---- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (revision 262367) -+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (revision 262368) -@@ -642,5 +642,5 @@ - int r; - if (rule.arg) -- r = seccomp_rule_add(seccomp, SCMP_ACT_ERRNO(EPERM), scall, 1, rule.arg); -+ r = seccomp_rule_add(seccomp, SCMP_ACT_ERRNO(EPERM), scall, 1, *rule.arg); - else - r = seccomp_rule_add(seccomp, SCMP_ACT_ERRNO(EPERM), scall, 0); diff --git a/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.28.3.bb index cf6b2ffae7..44de685548 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.28.3.bb @@ -19,10 +19,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://cross-compile.patch \ file://0001-Fix-build-with-musl.patch \ file://include_array.patch \ - file://CVE-2020-13753.patch \ " -SRC_URI[md5sum] = "ec0ef870ca37e3a5ebbead2f268a28ec" -SRC_URI[sha256sum] = "b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc68c30bd" +SRC_URI[sha256sum] = "f0898ac072c220e13a4aee819408421a6cb56a6eb89170ceafe52468b0903522" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc |