| Message ID | 20191214120820.15428-2-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | f064c7c449f162a9011ad890f26ceeca26934d22 |
| Headers | show |
lgtm On 12/14/19, Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: out of array read > Fixes: > 19309/clusterfuzz-testcase-minimized-ffmpeg_BSF_MP3_HEADER_DECOMPRESS_fuzzer-5651002950942720 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/mp3_header_decompress_bsf.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/libavcodec/mp3_header_decompress_bsf.c > b/libavcodec/mp3_header_decompress_bsf.c > index 294858953c..ab3d420300 100644 > --- a/libavcodec/mp3_header_decompress_bsf.c > +++ b/libavcodec/mp3_header_decompress_bsf.c > @@ -62,6 +62,11 @@ static int mp3_header_decompress(AVBSFContext *ctx, > AVPacket *out) > lsf = sample_rate < (24000+32000)/2; > mpeg25 = sample_rate < (12000+16000)/2; > sample_rate_index= (header>>10)&3; > + if (sample_rate_index == 3) { > + ret = AVERROR_INVALIDDATA; > + goto fail; > + } > + > sample_rate= avpriv_mpa_freq_tab[sample_rate_index] >> (lsf + mpeg25); > //in case sample rate is a little off > > for(bitrate_index=2; bitrate_index<30; bitrate_index++){ > -- > 2.24.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Sat, Dec 14, 2019 at 01:23:04PM +0100, Paul B Mahol wrote:
> lgtm
will apply
thx
[...]
diff --git a/libavcodec/mp3_header_decompress_bsf.c b/libavcodec/mp3_header_decompress_bsf.c index 294858953c..ab3d420300 100644 --- a/libavcodec/mp3_header_decompress_bsf.c +++ b/libavcodec/mp3_header_decompress_bsf.c @@ -62,6 +62,11 @@ static int mp3_header_decompress(AVBSFContext *ctx, AVPacket *out) lsf = sample_rate < (24000+32000)/2; mpeg25 = sample_rate < (12000+16000)/2; sample_rate_index= (header>>10)&3; + if (sample_rate_index == 3) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + sample_rate= avpriv_mpa_freq_tab[sample_rate_index] >> (lsf + mpeg25); //in case sample rate is a little off for(bitrate_index=2; bitrate_index<30; bitrate_index++){
Fixes: out of array read Fixes: 19309/clusterfuzz-testcase-minimized-ffmpeg_BSF_MP3_HEADER_DECOMPRESS_fuzzer-5651002950942720 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/mp3_header_decompress_bsf.c | 5 +++++ 1 file changed, 5 insertions(+)