From patchwork Sat Oct 19 20:39:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 15852 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 5D4AE449718 for ; Sat, 19 Oct 2019 23:41:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 40F9268ADDF; Sat, 19 Oct 2019 23:41:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8823968AD91 for ; Sat, 19 Oct 2019 23:41:50 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1iLvXp-0005Dz-0c for ffmpeg-devel@ffmpeg.org; Sat, 19 Oct 2019 22:41:49 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id LvWqiqJMKwlysLvWqiaJ7C; Sat, 19 Oct 2019 22:40:48 +0200 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=E5OzWpVl 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=sXgCjfrUpOHvZQONEgEA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 19 Oct 2019 22:39:46 +0200 Message-Id: <20191019203950.11689-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfFng86e0PEVxlN/atOubUPVDH/5jzsXUuniCx+hX54HH1SYWWpQyBn/saWPZpdLbf0rNHBbGQkoxCrM0gNGZDibgPd9cbmeIhtpZcjR9755g6ro6JOat rtqHKNFKRJIRnn4YZOa1+uqFkCWD9oqqaun4ulp/hMDW6MEYcQfZNUip Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/atrac9dec: Check precision_fine/coarse 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" I do not know if this or some clipping or other is the best course of action. I have only a fuzzed file which triggers this and neither reference code nor specification which would document what to do. If someone has some reference please reply Fixes: out of array access Fixes: 18330/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC9_fuzzer-5641113058148352 Signed-off-by: Michael Niedermayer --- libavcodec/atrac9dec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index 46e60ca998..0a249cf319 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -142,7 +142,7 @@ static inline int parse_gradient(ATRAC9Context *s, ATRAC9BlockData *b, return 0; } -static inline void calc_precision(ATRAC9Context *s, ATRAC9BlockData *b, +static inline int calc_precision(ATRAC9Context *s, ATRAC9BlockData *b, ATRAC9ChannelData *c) { memset(c->precision_mask, 0, sizeof(c->precision_mask)); @@ -187,10 +187,13 @@ static inline void calc_precision(ATRAC9Context *s, ATRAC9BlockData *b, for (int i = 0; i < b->q_unit_cnt; i++) { c->precision_fine[i] = 0; if (c->precision_coarse[i] > 15) { + if (c->precision_coarse[i] > 30) + return AVERROR_INVALIDDATA; c->precision_fine[i] = c->precision_coarse[i] - 15; c->precision_coarse[i] = 15; } } + return 0; } static inline int parse_band_ext(ATRAC9Context *s, ATRAC9BlockData *b, @@ -734,7 +737,9 @@ static int atrac9_decode_block(ATRAC9Context *s, GetBitContext *gb, if (read_scalefactors(s, b, c, gb, i, first_in_pkt)) return AVERROR_INVALIDDATA; - calc_precision (s, b, c); + if (calc_precision(s, b, c)) + return AVERROR_INVALIDDATA; + calc_codebook_idx (s, b, c); read_coeffs_coarse(s, b, c, gb); read_coeffs_fine (s, b, c, gb);