| Message ID | 20170816140323.14785-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 931c0ac95cebe62f2bdd53a81bf40e3916be6476 |
| Headers | show |
On 2017-08-16 16:03, Michael Niedermayer wrote: > Fixes: OOM > Fixes: 2710/clusterfuzz-testcase-minimized-4750001420894208 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/zmbv.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c > index f126515bd1..b09dc41ebd 100644 > --- a/libavcodec/zmbv.c > +++ b/libavcodec/zmbv.c > @@ -589,6 +589,11 @@ static av_cold int decode_init(AVCodecContext *avctx) > // Needed if zlib unused or init aborted before inflateInit > memset(&c->zstream, 0, sizeof(z_stream)); > > + if ((avctx->width + 255ULL) * (avctx->height + 64ULL) > FFMIN(avctx->max_pixels, INT_MAX / 4) ) { > + av_log(avctx, AV_LOG_ERROR, "Internal buffer (decomp_size) larger than max_pixels or too large\n"); > + return AVERROR_INVALIDDATA; > + } > + Looks like a decent solution /Tomas
On Thu, Aug 17, 2017 at 10:19:18AM +0200, Tomas Härdin wrote: > On 2017-08-16 16:03, Michael Niedermayer wrote: > >Fixes: OOM > >Fixes: 2710/clusterfuzz-testcase-minimized-4750001420894208 > > > >Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > >Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > >--- > > libavcodec/zmbv.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > >diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c > >index f126515bd1..b09dc41ebd 100644 > >--- a/libavcodec/zmbv.c > >+++ b/libavcodec/zmbv.c > >@@ -589,6 +589,11 @@ static av_cold int decode_init(AVCodecContext *avctx) > > // Needed if zlib unused or init aborted before inflateInit > > memset(&c->zstream, 0, sizeof(z_stream)); > >+ if ((avctx->width + 255ULL) * (avctx->height + 64ULL) > FFMIN(avctx->max_pixels, INT_MAX / 4) ) { > >+ av_log(avctx, AV_LOG_ERROR, "Internal buffer (decomp_size) larger than max_pixels or too large\n"); > >+ return AVERROR_INVALIDDATA; > >+ } > >+ > > Looks like a decent solution applied thx [...]
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index f126515bd1..b09dc41ebd 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -589,6 +589,11 @@ static av_cold int decode_init(AVCodecContext *avctx) // Needed if zlib unused or init aborted before inflateInit memset(&c->zstream, 0, sizeof(z_stream)); + if ((avctx->width + 255ULL) * (avctx->height + 64ULL) > FFMIN(avctx->max_pixels, INT_MAX / 4) ) { + av_log(avctx, AV_LOG_ERROR, "Internal buffer (decomp_size) larger than max_pixels or too large\n"); + return AVERROR_INVALIDDATA; + } + c->decomp_size = (avctx->width + 255) * 4 * (avctx->height + 64); /* Allocate decompression buffer */
Fixes: OOM Fixes: 2710/clusterfuzz-testcase-minimized-4750001420894208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/zmbv.c | 5 +++++ 1 file changed, 5 insertions(+)