From 0750b888b3144c09a3ab0430f3cb1a93c35f3cb2 Mon Sep 17 00:00:00 2001 From: happyworker <208suo@208suo.com> Date: Tue, 15 Jul 2025 15:35:44 +0800 Subject: [PATCH] fix-CVE-2025-22919 --- ffmpeg.spec | 8 ++++++-- fix-CVE-2025-22919.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 fix-CVE-2025-22919.patch diff --git a/ffmpeg.spec b/ffmpeg.spec index bcc3753..abefd75 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -73,7 +73,7 @@ Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} Version: 7.1 -Release: 8 +Release: 9 License: GPL-3.0-or-later URL: https://ffmpeg.org/ Source0: https://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz @@ -86,7 +86,8 @@ Patch7: backport-CVE-2025-0518.patch Patch8: backport-CVE-2025-22921.patch Patch9: CVE-2025-1816.patch Patch10: CVE-2025-25473.patch -Patch11: CVE-2024-55069.patch +Patch11: CVE-2024-55069.patch +Patch12: fix-CVE-2025-22919.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} @@ -410,6 +411,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %{_libdir}/lib*.so %changelog +* Tue Jul 15 2025 happyworker <208suo@208suo.com> - 7.1-9 +- fix-CVE-2025-22919 + * Tue Jul 8 2025 happyworker <208suo@208suo.com> - 7.1-8 - fix CVE-2024-55069 diff --git a/fix-CVE-2025-22919.patch b/fix-CVE-2025-22919.patch new file mode 100644 index 0000000..a92e789 --- /dev/null +++ b/fix-CVE-2025-22919.patch @@ -0,0 +1,29 @@ +From 746729aa53b6a6f6d3522f43fce84f21fd76cd5b Mon Sep 17 00:00:00 2001 +From: James Almer +Date: Tue, 15 Jul 2025 15:32:35 +0800 +Subject: [PATCH] avfilter/buffersrc: check for valid sample rate + +--- + libavfilter/buffersrc.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c +index b568200..c8195cd 100644 +--- a/libavfilter/buffersrc.c ++++ b/libavfilter/buffersrc.c +@@ -414,6 +414,12 @@ static av_cold int init_audio(AVFilterContext *ctx) + av_channel_layout_describe(&s->ch_layout, buf, sizeof(buf)); + } + ++ if (s->sample_rate <= 0) { ++ av_log(ctx, AV_LOG_ERROR, "Sample rate not set\n"); ++ return AVERROR(EINVAL); ++ } ++ ++ + if (!s->time_base.num) + s->time_base = (AVRational){1, s->sample_rate}; + +-- +2.43.0 + -- Gitee