diff mbox

[FFmpeg-devel,1/3] avcodec/iff: Check that video_size is large enough for the read parameters

Message ID 20191130202658.25719-1-michael@niedermayer.cc
State Accepted
Commit f1b97f62f86d5dca35d01d7a5ebbc5dca2a88ae6
Headers show

Commit Message

Michael Niedermayer Nov. 30, 2019, 8:26 p.m. UTC 
video is allocated before parameters like bpp are read.

Fixes: out of array access
Fixes: 19084/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5718556033679360

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/iff.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Niedermayer Dec. 27, 2019, 9:14 p.m. UTC | #1 
On Sat, Nov 30, 2019 at 09:26:56PM +0100, Michael Niedermayer wrote:
> video is allocated before parameters like bpp are read.
> 
> Fixes: out of array access
> Fixes: 19084/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5718556033679360
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/iff.c | 2 ++
>  1 file changed, 2 insertions(+)

will apply

[...]
diff mbox

Patch

diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 0656ae5509..ae4515b80b 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -322,6 +322,8 @@  static int extract_header(AVCodecContext *const avctx,
             av_log(avctx, AV_LOG_ERROR, "Invalid number of bitplanes: %u\n", s->bpp);
             return AVERROR_INVALIDDATA;
         }
+        if (s->video_size && s->planesize * s->bpp * avctx->height > s->video_size)
+            return AVERROR_INVALIDDATA;
 
         av_freep(&s->ham_buf);
         av_freep(&s->ham_palbuf);