diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2021-11-17 20:48:45 -0800 |
|---|---|---|
| committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2021-11-17 20:48:45 -0800 |
| commit | e18fbd00f235dd87479fde7ea039a6b8339f8f6a (patch) | |
| tree | 403ff7e0766d935cebf63169f23a606db9c20398 /dev-java/openjfx | |
| parent | dev-java/openjdk-bin: drop 17_p35 (diff) | |
| download | gentoo-e18fbd00f235dd87479fde7ea039a6b8339f8f6a.tar.gz gentoo-e18fbd00f235dd87479fde7ea039a6b8339f8f6a.tar.bz2 gentoo-e18fbd00f235dd87479fde7ea039a6b8339f8f6a.zip | |
dev-java/openjfx: add gstreamer CVE-2021-3522 fix
Bug: https://bugs.gentoo.org/819633
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'dev-java/openjfx')
| -rw-r--r-- | dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch | 31 | ||||
| -rw-r--r-- | dev-java/openjfx/openjfx-11.0.11_p1.ebuild | 1 |
2 files changed, 32 insertions, 0 deletions
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?= <tim@centricular.com> +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}" |