From patchwork Sat Sep 10 22:30:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37840 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1690706pzh; Sat, 10 Sep 2022 15:31:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR4AvlUQgUxzeeCquryypl9NFPZ9yMzZq3dZ7wAp+CzvzOtsQvSiLJxjJsHwT3S0ZetYJMle X-Received: by 2002:aa7:d150:0:b0:44e:3c06:d719 with SMTP id r16-20020aa7d150000000b0044e3c06d719mr17056754edo.265.1662849071439; Sat, 10 Sep 2022 15:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662849071; cv=none; d=google.com; s=arc-20160816; b=U1Sw+tyUmK1733pvFNp08dnBNOVoMfLhaahXR5hBnnkLp2AsKAvybae1UkQGvtdpz9 QKOEIm0o+ZBn0YKP4EG9YtuDuOka8juyLcvD7Aw0AFDB9NwGCYIOQ3ngVaJVewRVPHb3 iKofF/15PeUVIA1KM2nrLXDui/4ca7nHF92NDq+0dYANHQVOi2fD9izOXy8sdL+M2Nm4 Yg3XnlDr6dr1MUKGWceYukeeOjtv/sH/Ls8zcjAMVI1W9Ehxgaex+GHVEx5pUZMovMxd 1rZMPf+gr7qj6pA0wbWvEKY6SlRSjdrZuAVA2Isg8b9CAFeKApfy+MzWerXO6BowSzim 7Xvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=efyykiIMghtUf+FB6vI9WckpeVrdDMN6UYo/4v1srK4=; b=klpdZFy8AAZ0wxYInib0UQVyvOhM3nRoggO6Q8Q3Dc9NM/I315LyL3n8C51udv5dj5 UBIEPEgrxoIsX/r6ruxOhAXNFkHGn43Oq8vZSfszfLdGbMOEo1wwjp9BDN+FUu9EnbZY AuKKb/u8EF2zTuO6DTidjaV1W7PxRKfOi6516FDVkJugQFTdVE/ZJ4pPssw9B0CNTxmT OkRqFIatGHm3lsAo4gFSSu4IKQgP3B3TEcFxhO4Z4aFKl6wEW/dLAyITCtplW4bB0ZxN hrtwcjZlb3h8NnUmaaDDhQAxhNu2d2WsZzolRpcskDF6U6IaaWhSLdvzpbtITdM9gXmR uuRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id js9-20020a17090797c900b0077cc598a100si118937ejc.2.2022.09.10.15.31.11; Sat, 10 Sep 2022 15:31:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1825A68BB2D; Sun, 11 Sep 2022 01:30:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD1AA68BB04 for ; Sun, 11 Sep 2022 01:30:49 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oX8zw-001tW2-9D for ffmpeg-devel@ffmpeg.org; Sun, 11 Sep 2022 00:30:48 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id X8zToAq098s8UX8zvopKqW; Sun, 11 Sep 2022 00:30:48 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id X8zvoXwe08eSWX8zvoIVdC; Sun, 11 Sep 2022 00:30:47 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=631d1017 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=EGuGzb794k-4MbXI5gUA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Sep 2022 00:30:42 +0200 Message-Id: <20220910223046.5135-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfNHmSjA9tCyQeaUR+0s6SiHUrEnqMaRFoZkhoG9EITNXTfPpVM+pakJED/+SpVmUVL4rsVgsUOLXnP209NpqaXZ/EhZWEdNQrzcBbEJlhAo9sSf0vsmH smkBROHxVkDmsUJ1cu6v2nUbIcviOZhPc0ZkfSINBrUVZsMq31TJgHgMQQEKXYwotYGFV+btMRjZgg== Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/apedec: Fix integer overflow in filter_3800() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Sk96mLMvCTDi Fixes: signed integer overflow: -2147448926 + -198321 cannot be represented in type 'int' Fixes: 48798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5739619273015296 Fixes: 48798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-6744428485672960 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apedec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 4e3ddfea01b..c08d13d6c23 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -934,7 +934,7 @@ static av_always_inline int filter_3800(APEPredictor *p, p->coeffsB[filter][0] += (((d3 >> 29) & 4) - 2) * sign; p->coeffsB[filter][1] -= (((d4 >> 30) & 2) - 1) * sign; - p->filterB[filter] = p->lastA[filter] + (predictionB >> shift); + p->filterB[filter] = p->lastA[filter] + (unsigned)(predictionB >> shift); p->filterA[filter] = p->filterB[filter] + (unsigned)((int)(p->filterA[filter] * 31U) >> 5); return p->filterA[filter];