| Message ID | 20200820085046.5628-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 7577f8332a6bb2f227b876c83ec6fa45cc9670f9 |
| Headers | show |
| Series | [FFmpeg-devel,1/4] avcodec/tiff: Check the linearization table size | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On Thu, Aug 20, 2020 at 10:50:43AM +0200, Michael Niedermayer wrote: > Fixes: out of array access > Fixes: 24604/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4843529818603520 > > 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 | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) will apply patchset [...]
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 08dbca9d60..8c0b6f0853 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1434,7 +1434,9 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) s->sub_ifd = ff_tget(&s->gb, TIFF_LONG, s->le); /** Only get the first SubIFD */ break; case DNG_LINEARIZATION_TABLE: - for (int i = 0; i < FFMIN(count, 1 << s->bpp); i++) + if (count > FF_ARRAY_ELEMS(s->dng_lut)) + return AVERROR_INVALIDDATA; + for (int i = 0; i < count; i++) s->dng_lut[i] = ff_tget(&s->gb, type, s->le); break; case DNG_BLACK_LEVEL:
Fixes: out of array access Fixes: 24604/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4843529818603520 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)