From patchwork Sat Feb 29 23:48:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 17980 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 84545449A2A for ; Sun, 1 Mar 2020 01:49:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46C5B68B04D; Sun, 1 Mar 2020 01:49:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0D2E68AEAD for ; Sun, 1 Mar 2020 01:49:39 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1j8BrX-0009LJ-0M for ffmpeg-devel@ffmpeg.org; Sun, 01 Mar 2020 00:49:39 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 8BqXjMa5s6Jy68BqYjvzLc; Sun, 01 Mar 2020 00:48:38 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=GKl27dFK c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=uwzKiFflc268bXiMEqcA:9 a=3uq4twb6QRWMCHcu:21 a=WaEqepYKsEGK_XST:21 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 1 Mar 2020 00:48:37 +0100 Message-Id: <20200229234837.14142-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfIcFaYaEUMrG8FYpQKZjYmc/hKK/Xsl8Hd2RT8YNYpIKGBNtEmwdGQMSLg9nBYPZoKeTSxZS3V/8loyfjb16ulqo2nyqL5GcEvnmBKAu6FgFtguwOsRU dzOEHeQl0BzBrj2f2MWeAkKkDb3wjQPCjeojTKvg5p74JvdBiRHdX/eb Subject: [FFmpeg-devel] [PATCH] avcodec/siren: Check several indexes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: Multiple out of array accesses Fixes: 20817/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SIREN_fuzzer-5754041227542528.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/siren.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 2577ff52dd..76dfe62843 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -428,6 +428,7 @@ static int decode_envelope(SirenContext *s, GetBitContext *gb, int *absolute_region_power_index, int esf_adjustment) { absolute_region_power_index[0] = (int)get_bits(gb, 5) - esf_adjustment; + absolute_region_power_index[0] = av_clip(absolute_region_power_index[0], -24, 39); decoder_standard_deviation[0] = s->standard_deviation[absolute_region_power_index[0] + 24]; for (int i = 1; i < number_of_regions; i++) { @@ -437,7 +438,7 @@ static int decode_envelope(SirenContext *s, GetBitContext *gb, index = differential_decoder_tree[i - 1][index][get_bits1(gb)]; } while (index > 0); - absolute_region_power_index[i] = absolute_region_power_index[i - 1] - index - 12; + absolute_region_power_index[i] = av_clip(absolute_region_power_index[i - 1] - index - 12, -24, 39); decoder_standard_deviation[i] = s->standard_deviation[absolute_region_power_index[i] + 24]; } @@ -500,6 +501,8 @@ static int categorize_regions(int number_of_regions, int number_of_available_bit } } } + if (raw_value == -99) + return AVERROR_INVALIDDATA; *min_rate_ptr++ = raw_min_idx; min += expected_bits_table[min_rate_categories[raw_min_idx] + 1] - @@ -518,6 +521,8 @@ static int categorize_regions(int number_of_regions, int number_of_available_bit } } } + if (raw_value == 99) + return AVERROR_INVALIDDATA; *--max_rate_ptr = raw_max_idx; max += expected_bits_table[max_rate_categories[raw_max_idx] - 1] - @@ -684,9 +689,11 @@ static int siren_decode(AVCodecContext *avctx, void *data, rate_control = get_bits(gb, 4); - categorize_regions(s->number_of_regions, get_bits_left(gb), - s->absolute_region_power_index, s->power_categories, - s->category_balance); + ret = categorize_regions(s->number_of_regions, get_bits_left(gb), + s->absolute_region_power_index, s->power_categories, + s->category_balance); + if (ret < 0) + return ret; for (int i = 0; i < rate_control; i++) s->power_categories[s->category_balance[i]]++;