diff mbox series

[FFmpeg-devel] avcodec/tiff: Check input space in dng_decode_jpeg()

Message ID 20200710154730.24603-1-michael@niedermayer.cc
State Accepted
Commit 79e8d17024e6c6328a40fcee191ffd70798a9c6e
Headers show
Series [FFmpeg-devel] avcodec/tiff: Check input space in dng_decode_jpeg() | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Michael Niedermayer July 10, 2020, 3:47 p.m. UTC 
Fixes: out of array read
Fixes: 24034/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5111884337119232

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

Comments

Michael Niedermayer July 10, 2020, 6:22 p.m. UTC | #1 
On Fri, Jul 10, 2020 at 05:47:30PM +0200, Michael Niedermayer wrote:
> Fixes: out of array read
> Fixes: 24034/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5111884337119232
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/tiff.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply and backport

[...]
diff mbox series

Patch

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 6a3ec3ef95..18b327e800 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -882,6 +882,9 @@  static int dng_decode_jpeg(AVCodecContext *avctx, AVFrame *frame,
     int is_single_comp, is_u16, pixel_size;
     int ret;
 
+    if (tile_byte_count < 0 || tile_byte_count > bytestream2_get_bytes_left(&s->gb))
+        return AVERROR_INVALIDDATA;
+
     /* Prepare a packet and send to the MJPEG decoder */
     av_init_packet(&jpkt);
     jpkt.data = (uint8_t*)s->gb.buffer;