diff options
| author | Max Rees <maxcrees@me.com> | 2020-05-05 11:25:48 -0500 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2020-05-05 11:25:48 -0500 |
| commit | ece7d1f171e81a88656947c48925da94f4d2105f (patch) | |
| tree | ba1922ec64c18ef4327140f9e54187938a27b5f4 /user/ffmpeg/CVE-2020-12284.patch | |
| parent | f0b42a82699bb782fd074517ca488f1de239e623 (diff) | |
| download | packages-ece7d1f171e81a88656947c48925da94f4d2105f.tar.gz packages-ece7d1f171e81a88656947c48925da94f4d2105f.tar.bz2 packages-ece7d1f171e81a88656947c48925da94f4d2105f.tar.xz packages-ece7d1f171e81a88656947c48925da94f4d2105f.zip | |
user/ffmpeg: patch CVE-2019-13312 and CVE-2020-12284 (#156)
Diffstat (limited to 'user/ffmpeg/CVE-2020-12284.patch')
| -rw-r--r-- | user/ffmpeg/CVE-2020-12284.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/user/ffmpeg/CVE-2020-12284.patch b/user/ffmpeg/CVE-2020-12284.patch new file mode 100644 index 000000000..7360b5870 --- /dev/null +++ b/user/ffmpeg/CVE-2020-12284.patch @@ -0,0 +1,32 @@ +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> +--- + libavcodec/cbs_jpeg.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c +index 6bbce5f..89512a2 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); +-- +2.7.4 + |