Re: [FFmpeg-devel] [PATCH] avcodec/huffyuvdec: Check slice_offset/size

2019-01-27 Thread Michael Niedermayer 
On Mon, Jan 21, 2019 at 01:08:41AM +0100, Michael Niedermayer wrote:
> Fixes: out of array access
> Fixes: 
> 12447/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HYMT_fuzzer-5201623956062208
> Fixes: 
> 12458/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HYMT_fuzzer-5705567736168448
> 
> Found-by: continuous fuzzing process 
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer 
> ---
>  libavcodec/huffyuvdec.c | 5 +
>  1 file changed, 5 insertions(+)

will apply

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The smallest minority on earth is the individual. Those who deny 
individual rights cannot claim to be defenders of minorities. - Ayn Rand


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] avcodec/huffyuvdec: Check slice_offset/size

2019-01-20 Thread Michael Niedermayer 
Fixes: out of array access
Fixes: 
12447/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HYMT_fuzzer-5201623956062208
Fixes: 
12458/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HYMT_fuzzer-5705567736168448

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
---
 libavcodec/huffyuvdec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index 8226c07743..27f650d7bf 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -1268,6 +1268,11 @@ static int decode_frame(AVCodecContext *avctx, void 
*data, int *got_frame,
 if (nb_slices > 1) {
 slice_offset = AV_RL32(avpkt->data + slices_info_offset + slice * 
8);
 slice_size = AV_RL32(avpkt->data + slices_info_offset + slice * 8 
+ 4);
+
+if (slice_offset < 0 || slice_size <= 0 || (slice_offset&3) ||
+slice_offset + (int64_t)slice_size > buf_size)
+return AVERROR_INVALIDDATA;
+
 y_offset = height - (slice + 1) * slice_height;
 s->bdsp.bswap_buf((uint32_t *)s->bitstream_buffer,
   (const uint32_t *)(buf + slice_offset), 
slice_size / 4);
-- 
2.20.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel