commit:     e18fbd00f235dd87479fde7ea039a6b8339f8f6a
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 04:48:45 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 04:48:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18fbd00

dev-java/openjfx: add gstreamer CVE-2021-3522 fix

Bug: https://bugs.gentoo.org/819633
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../openjfx/files/11/gstreamer-CVE-2021-3522.patch | 31 ++++++++++++++++++++++
 dev-java/openjfx/openjfx-11.0.11_p1.ebuild         |  1 +
 2 files changed, 32 insertions(+)

diff --git a/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch 
b/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch
new file mode 100644
index 000000000000..600f1cb84640
--- /dev/null
+++ b/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch
@@ -0,0 +1,31 @@
+From 8a88e5c1db05ebadfd4569955f6f47c23cdca3c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
+Date: Wed, 3 Mar 2021 01:08:25 +0000
+Subject: [PATCH] tag: id3v2: fix frame size check and potential invalid reads
+
+Check the right variable when checking if there's
+enough data left to read the frame size.
+
+Closes https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/876
+
+Part-of: 
<https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1066>
+---
+ gst-libs/gst/tag/id3v2frames.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gst-libs/gst/tag/id3v2frames.c b/gst-libs/gst/tag/id3v2frames.c
+index 8e9f78254..f39659bf7 100644
+--- 
a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2frames.c
++++ 
b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2frames.c
+@@ -109,7 +109,7 @@ id3v2_parse_frame (ID3TagsWorking * work)
+ 
+   if (work->frame_flags & (ID3V2_FRAME_FORMAT_COMPRESSION |
+           ID3V2_FRAME_FORMAT_DATA_LENGTH_INDICATOR)) {
+-    if (work->hdr.frame_data_size <= 4)
++    if (frame_data_size <= 4)
+       return FALSE;
+     if (ID3V2_VER_MAJOR (work->hdr.version) == 3) {
+       work->parse_size = GST_READ_UINT32_BE (frame_data);
+-- 
+GitLab
+

diff --git a/dev-java/openjfx/openjfx-11.0.11_p1.ebuild 
b/dev-java/openjfx/openjfx-11.0.11_p1.ebuild
index e2ae13e4147f..7d61ff67f2c2 100644
--- a/dev-java/openjfx/openjfx-11.0.11_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.11_p1.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
        "${FILESDIR}"/11/wno-error-11.0.11.patch
        "${FILESDIR}"/11/don-t-force-msse-11.0.11.patch
        "${FILESDIR}"/11/disable-architecture-verification.patch
+       "${FILESDIR}"/11/gstreamer-CVE-2021-3522.patch
 )
 
 S="${WORKDIR}/rt-${MY_PV}"

Reply via email to