package/ffmpeg: fix CVE-2020-12284
cbs_jpeg_split_fragment in libavcodec/cbs_jpeg.c in FFmpeg 4.2.2 has a heap-based buffer overflow during JPEG_MARKER_SOS handling because of a missing length check. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
2452aa182d
commit
aab52d8722
|
@ -0,0 +1,33 @@
|
|||
From 1812352d767ccf5431aa440123e2e260a4db2726 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Niedermayer <michael@niedermayer.cc>
|
||||
Date: Sat, 7 Mar 2020 15:42:58 +0100
|
||||
Subject: [PATCH] avcodec/cbs_jpeg: Check length for SOS
|
||||
|
||||
Fixes: out of array access
|
||||
Fixes: 19734/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5673507031875584
|
||||
Fixes: 19353/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5703944462663680
|
||||
|
||||
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
|
||||
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/FFmpeg/FFmpeg/commit/1812352d767ccf5431aa440123e2e260a4db2726]
|
||||
---
|
||||
libavcodec/cbs_jpeg.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c
|
||||
index 6bbce5f89b7..89512a26bbf 100644
|
||||
--- a/libavcodec/cbs_jpeg.c
|
||||
+++ b/libavcodec/cbs_jpeg.c
|
||||
@@ -197,6 +197,9 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx,
|
||||
if (marker == JPEG_MARKER_SOS) {
|
||||
length = AV_RB16(frag->data + start);
|
||||
|
||||
+ if (length > end - start)
|
||||
+ return AVERROR_INVALIDDATA;
|
||||
+
|
||||
data_ref = NULL;
|
||||
data = av_malloc(end - start +
|
||||
AV_INPUT_BUFFER_PADDING_SIZE);
|
|
@ -16,6 +16,9 @@ FFMPEG_LICENSE += and GPL-2.0+
|
|||
FFMPEG_LICENSE_FILES += COPYING.GPLv2
|
||||
endif
|
||||
|
||||
# 0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch
|
||||
FFMPEG_IGNORE_CVES += CVE-2020-12284
|
||||
|
||||
FFMPEG_CONF_OPTS = \
|
||||
--prefix=/usr \
|
||||
--enable-avfilter \
|
||||
|
|
Loading…
Reference in a new issue