From patchwork Thu Sep 24 09:03:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 22568 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 9A69344BC0D for ; Thu, 24 Sep 2020 12:11:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8571768B93D; Thu, 24 Sep 2020 12:11:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08DA468974F for ; Thu, 24 Sep 2020 12:11:10 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1kLNBE-00043w-0E for ffmpeg-devel@ffmpeg.org; Thu, 24 Sep 2020 11:04:44 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id LNAFkC8LDIr7GLNAFk4twr; Thu, 24 Sep 2020 11:03:43 +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=QN4WuTDL 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=-_9i-eTdipuMXZ40kBcA:9 a=mZfOQz_HFdm4PXSM:21 a=0C030mPgiI85Vjf4:21 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 24 Sep 2020 11:03:42 +0200 Message-Id: <20200924090343.19794-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfP+cRSCq6yMbdnPU7bOAt9TiOEYFh6/pBSpLbRAyc0MYMaAHPlaceX3y87JqlMqCxbXLQ6UJBVXZecS0xPhHLEuVOtniSZHrlEm0/WyWd9rRZVqeis8q vjjF5jleXGxOglzEzPsB5JHebLlvfzmd9lFyHMm/QFKZwAiOi2Po/dZ0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/celp_filters: Avoid invalid negation in ff_celp_lp_synthesis_filter() 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: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself Fixes: 25675/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G729_fuzzer-4786580731199488 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/celp_filters.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/celp_filters.c b/libavcodec/celp_filters.c index fafedd99a3..40ff7427df 100644 --- a/libavcodec/celp_filters.c +++ b/libavcodec/celp_filters.c @@ -65,11 +65,11 @@ int ff_celp_lp_synthesis_filter(int16_t *out, const int16_t *filter_coeffs, int i,n; for (n = 0; n < buffer_length; n++) { - int sum = -rounder, sum1; + int sum = rounder, sum1; for (i = 1; i <= filter_length; i++) - sum += (unsigned)(filter_coeffs[i-1] * out[n-i]); + sum -= (unsigned)(filter_coeffs[i-1] * out[n-i]); - sum1 = ((-sum >> 12) + in[n]) >> shift; + sum1 = ((sum >> 12) + in[n]) >> shift; sum = av_clip_int16(sum1); if (stop_on_overflow && sum != sum1) From patchwork Thu Sep 24 09:03:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 22567 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 7B97244B6F6 for ; Thu, 24 Sep 2020 12:10:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5721568B919; Thu, 24 Sep 2020 12:10:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-2.mx.upcmail.net (vie01a-dmta-pe02-2.mx.upcmail.net [62.179.121.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2E7C68B892 for ; Thu, 24 Sep 2020 12:10:20 +0300 (EEST) 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 1kLNBE-000AET-0E for ffmpeg-devel@ffmpeg.org; Thu, 24 Sep 2020 11:04:44 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id LNAGkC8N7Ir7GLNAGk4tyM; Thu, 24 Sep 2020 11:03:44 +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=QN4WuTDL 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=o-PCxEVecWOpg7ubOAAA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 24 Sep 2020 11:03:43 +0200 Message-Id: <20200924090343.19794-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200924090343.19794-1-michael@niedermayer.cc> References: <20200924090343.19794-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfP+cRSCq6yMbdnPU7bOAt9TiOEYFh6/pBSpLbRAyc0MYMaAHPlaceX3y87JqlMqCxbXLQ6UJBVXZecS0xPhHLEuVOtniSZHrlEm0/WyWd9rRZVqeis8q vjjF5jleXGxOglzEzPsB5JHebLlvfzmd9lFyHMm/QFKZwAiOi2Po/dZ0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/mobiclip: Move quantizer check into setup_qtables() 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: shift exponent -2 is negative Fixes: 25683/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOBICLIP_fuzzer-6434808492982272 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mobiclip.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index 47387fce90..f890cb2599 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -382,11 +382,14 @@ static av_cold int mobiclip_init(AVCodecContext *avctx) return 0; } -static void setup_qtables(AVCodecContext *avctx, int quantizer) +static int setup_qtables(AVCodecContext *avctx, int quantizer) { MobiClipContext *s = avctx->priv_data; int qx, qy; + if (quantizer < 12 || quantizer > 161) + return AVERROR_INVALIDDATA; + s->quantizer = quantizer; qx = quantizer % 6; @@ -400,6 +403,8 @@ static void setup_qtables(AVCodecContext *avctx, int quantizer) for (int i = 0; i < 20; i++) s->pre[i] = 9; + + return 0; } static void inverse4(int *rs) @@ -1313,7 +1318,10 @@ static int mobiclip_decode(AVCodecContext *avctx, void *data, s->moflex = get_bits1(gb); s->dct_tab_idx = get_bits1(gb); - setup_qtables(avctx, get_bits(gb, 6)); + ret = setup_qtables(avctx, get_bits(gb, 6)); + if (ret < 0) + return ret; + for (int y = 0; y < avctx->height; y += 16) { for (int x = 0; x < avctx->width; x += 16) { ret = decode_macroblock(avctx, frame, x, y, get_bits1(gb)); @@ -1323,10 +1331,6 @@ static int mobiclip_decode(AVCodecContext *avctx, void *data, } } else { MotionXY *motion = s->motion; - int quantizer = s->quantizer + get_se_golomb(gb); - - if (quantizer < 12 || quantizer > 161) - return AVERROR_INVALIDDATA; memset(motion, 0, s->motion_size); @@ -1334,7 +1338,10 @@ static int mobiclip_decode(AVCodecContext *avctx, void *data, frame->key_frame = 0; s->dct_tab_idx = 0; - setup_qtables(avctx, quantizer); + ret = setup_qtables(avctx, s->quantizer + get_se_golomb(gb)); + if (ret < 0) + return ret; + for (int y = 0; y < avctx->height; y += 16) { for (int x = 0; x < avctx->width; x += 16) { int idx;