mirror of
https://git.yoctoproject.org/poky
synced 2026-07-16 15:57:04 +00:00
ffmpeg: fix CVE-2024-36617
FFmpeg n6.1.1 has an integer overflow vulnerability in the FFmpeg CAF decoder. (From OE-Core rev: aec2ad743893d72d46c79701a0dac982931e3171) Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
2133671f72
commit
0fb074b621
@@ -0,0 +1,38 @@
|
||||
From f0e780370cc1c437d64f10d326b1d656ef490b5f Mon Sep 17 00:00:00 2001
|
||||
From: Michael Niedermayer <michael@niedermayer.cc>
|
||||
Date: Sat, 30 Sep 2023 00:38:17 +0200
|
||||
Subject: [PATCH 4/4] avformat/cafdec: dont seek beyond 64bit
|
||||
|
||||
Fixes: signed integer overflow: 64 + 9223372036854775807 cannot be represented in type 'long long'
|
||||
Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6418242730328064
|
||||
Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6418242730328064
|
||||
|
||||
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
|
||||
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
||||
(cherry picked from commit d973fcbcc2f944752ff10e6a76b0b2d9329937a7)
|
||||
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
||||
|
||||
CVE: CVE-2024-36617
|
||||
|
||||
Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/f0e780370cc1c437d64f10d326b1d656ef490b5f]
|
||||
|
||||
Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
|
||||
---
|
||||
libavformat/cafdec.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
|
||||
index d5668bf..aa56a5e 100644
|
||||
--- a/libavformat/cafdec.c
|
||||
+++ b/libavformat/cafdec.c
|
||||
@@ -220,7 +220,7 @@ static int read_pakt_chunk(AVFormatContext *s, int64_t size)
|
||||
}
|
||||
}
|
||||
|
||||
- if (avio_tell(pb) - ccount > size) {
|
||||
+ if (avio_tell(pb) - ccount > size || size > INT64_MAX - ccount) {
|
||||
av_log(s, AV_LOG_ERROR, "error reading packet table\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
--
|
||||
2.40.0
|
||||
@@ -46,6 +46,7 @@ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
|
||||
file://CVE-2025-0518.patch \
|
||||
file://CVE-2024-36613.patch \
|
||||
file://CVE-2024-36616.patch \
|
||||
file://CVE-2024-36617.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "ef2efae259ce80a240de48ec85ecb062cecca26e4352ffb3fda562c21a93007b"
|
||||
|
||||
Reference in New Issue
Block a user