From 757da551236f1081cb5e46b73d357036c5599bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AF=9B=E7=84=B1=E5=B9=B3?= Date: Fri, 18 Apr 2025 08:27:17 +0000 Subject: [PATCH 1/2] fix CVE-2025-22921 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 毛焱平 --- backport-CVE-2025-22921.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 backport-CVE-2025-22921.patch diff --git a/backport-CVE-2025-22921.patch b/backport-CVE-2025-22921.patch new file mode 100644 index 0000000..47016c7 --- /dev/null +++ b/backport-CVE-2025-22921.patch @@ -0,0 +1,24 @@ +From 7fc8f37e0e37b52a28cc05639ede64ad32f3c53f Mon Sep 17 00:00:00 2001 +From: maoyanping +Date: Fri, 18 Apr 2025 16:17:00 +0800 +Subject: [PATCH] backport-CVE-2025-22921 + +--- + libavcodec/jpeg2000dec.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c +index 691cfbd..b56902c 100644 +--- a/libavcodec/jpeg2000dec.c ++++ b/libavcodec/jpeg2000dec.c +@@ -1223,6 +1223,7 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, + } + } + av_freep(&cblk->lengthinc); ++ cblk->nb_lengthinc = 0; + } + } + // Save state of stream +-- +2.33.0 + -- Gitee From 5ea25d2af9e362e9eca2489aa2ea04c7eee6068e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AF=9B=E7=84=B1=E5=B9=B3?= Date: Fri, 18 Apr 2025 08:28:53 +0000 Subject: [PATCH 2/2] fix CVE-2025-22921 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 毛焱平 --- ffmpeg.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index 83592a7..f155964 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -62,7 +62,7 @@ Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} Version: 6.1.1 -Release: 20 +Release: 21 License: GPL-3.0-or-later URL: http://ffmpeg.org/ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz @@ -88,6 +88,7 @@ Patch17: backport-CVE-2024-36619.patch Patch18: backport-CVE-2024-35369.patch Patch19: backport-CVE-2024-36613.patch Patch20: backport-CVE-2024-35365.patch +Patch21: backport-CVE-2025-22921.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} @@ -417,6 +418,12 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %changelog +* Fri Apr 18 2025 maoyanping - 6.1.1-21 +- Type: CVE +- CVE: CVE-2025-22921 +- SUG: NA +- DESC: fix CVE-2025-22921 + * Mon Jan 13 2025 changtao - 6.1.1-20 - Type: CVE - CVE: CVE-2024-35365 -- Gitee