qzhao/ffmpeg-4
SHA256
1
0
Fork 0
forked from jengelh/ffmpeg-4
Code Pull Requests Activity

Add ffmpeg-4-CVE-2024-36618.patch, add CVE log in previous update log, to fix and recored (CVE-2022-1475, bsc#1198898, CVE-2024-36618, bsc#1234020, CVE-2024-36617, bsc#1234019, CVE-2024-36616, bsc#1234018 )

Browse Source
This commit is contained in:
Cliff Zhao
2025-06-05 22:01:21 +08:00
parent 420e661938
commit b0492f2178
3 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ffmpeg-4-CVE-2024-36618.patch Normal file
View File

@@ -0,0 +1,23 @@
commit 7a089ed8e049e3bfcb22de1250b86f2106060857
Author: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Tue Mar 12 23:23:17 2024 +0100
avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX
Affects many FATE-tests, see
https://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1694,7 +1694,7 @@
int *idx = av_mallocz_array(s->nb_streams, sizeof(*idx));
if (!idx)
return AVERROR(ENOMEM);
- for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1LU) {
+ for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1ULL) {
int64_t max_dts = INT64_MIN / 2;
int64_t min_dts = INT64_MAX / 2;
int64_t max_buffer = 0;

11
ffmpeg-4.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri May 30 14:28:05 UTC 2025 - Cliff Zhao <qzhao@suse.com>
- Add ffmpeg-4-CVE-2024-36618.patch:
Backport 7a089ed8 from upstream, avformat/avidec: Fix integer
overflow iff ULONG_MAX < INT64_MAX.
(CVE-2024-36618, bsc#1234020)
-------------------------------------------------------------------
Thu May 29 20:43:43 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
@@ -77,6 +85,8 @@ Mon Jan 6 11:53:32 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464
Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 'int'
(CVE-2024-36613, bsc#1235092)
avformat/cafdec: dont seek beyond 64bit (CVE-2024-36617, bsc#1234019).
avformat/westwood_vqa: Fix 2g packets (CVE-2024-36616, bsc#1234018).
- Delete
0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch
0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
@@ -714,6 +724,7 @@ Tue Aug 6 15:35:35 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
* mov muxer writes tracks with unspecified language instead
of English by default
* added support for using clang to compile CUDA kernels
* avcodec/g729_parser: Check channels (CVE-2022-1475, bsc#1198898)
- Drop ffmpeg-avcodec-libdav1d-AV1-decoder-wrapper.patch, merged
upstream.
- Rebase and rename

1
ffmpeg-4.spec
View File

@@ -141,6 +141,7 @@ Patch25: ffmpeg-4-CVE-2024-12361.patch
Patch28: ffmpeg-4-CVE-2025-25473.patch
Patch29: ffmpeg-4-CVE-2025-22921.patch
Patch30: ffmpeg-avcodec-libdav1d-don-t-repeatedly-parse-the-same-seq.patch
Patch31: ffmpeg-4-CVE-2024-36618.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel