From 01f1756ec64fca6275c02842a9674f6f846e7e700a2bf37868b6f4e86b4a6d21 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 29 Apr 2020 12:54:41 +0000 Subject: [PATCH] - Add 0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=112 --- ...vcodec-cbs_jpeg-Check-length-for-SOS.patch | 32 +++++++++++++++++++ ffmpeg-4.changes | 6 ++++ ffmpeg-4.spec | 1 + 3 files changed, 39 insertions(+) create mode 100644 0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch diff --git a/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch b/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch new file mode 100644 index 0000000..07ff6df --- /dev/null +++ b/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch @@ -0,0 +1,32 @@ +From 1812352d767ccf5431aa440123e2e260a4db2726 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer +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 +--- + libavcodec/cbs_jpeg.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c +index 6bbce5f89b..89512a26bb 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.26.2 + diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index c08d104..3e35d1a 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 29 12:16:11 UTC 2020 - Jan Engelhardt + +- Add 0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch + [boo#1170767] + ------------------------------------------------------------------- Fri Mar 31 00:41:22 UTC 2020 - Ismail Dönmez diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 6948763..b819067 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -118,6 +118,7 @@ Patch6: ffmpeg-4.2-dlopen-fdk_aac.patch Patch7: ffmpeg4_swscale_replace_illegal_vector_keyword.patch Patch8: ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch Patch9: 929e5159bc13da374b83f5627879c607acce180b.patch +Patch10: 0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel