From patchwork Mon May 2 15:07:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35543 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1853777pzb; Mon, 2 May 2022 08:08:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZPLzScQey1cMy/bUXjoO2TMq2DHJaKOdGRD67I/cDpJCTn2KAjOjJXKruYckRldK2mYni X-Received: by 2002:a17:906:6d91:b0:6f4:5433:72f5 with SMTP id h17-20020a1709066d9100b006f4543372f5mr4441962ejt.414.1651504093942; Mon, 02 May 2022 08:08:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651504093; cv=none; d=google.com; s=arc-20160816; b=Zj7Ei/Ch32W9ufqb44f9xPlArukJJP6uLcZlJbNL/9MF8+sY0qksWZARFdjH3833T3 hHwtXMqXFHtZ+8C5DbdFyRr4fWZ1Bx2tiUB88KdhEX8I35Ow7ZOZC4HxOm7Cg6kiKGV5 wNLyElT5MKRp7sJRffxoCCej83cJN5U6uc/xCCPjAB51Bl13bnv8pSK90axdg2nBKo35 7UNu65SAI6U+cPNka0hNbvfz6VFRDKcX3qg1B1dfv6ZjIgu3yM99NKgzzHZ5aX7YIDwt kWP/K4MlfjNS6LQcw4yGOy2tpPPCLUeeN21qFKG7CLzIR90oCo7tMaUb8o2LWQkvO7Rs 78gg== 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=DiociEUVhJWXcYvI2u5mjarLJLDuJ/hAOyN6/bkpk3M=; b=sH0S3u2dS44IPcKrpPs4meq0YN50hF1zOIGA9iOxQHkAiroYJa/bfLPzzDl1giMFjq nvWwurTo5zXWxS/QVyHI9goj8lB2DwmcPaL6s2XB/WErhNTovWF2beaAgrzQkrJWBeXu ewI7+BgyoGqWtH+SAHOi83qewD4NNmD/KbBAC7iqQuMafD+AMoY8EoAqmih8ayxiN89Q SRY90oL7CLPrAjMeWaSwmumOp1ERp+Hy+l24twSoJ/iEBUXQfb/LGDHFuu3S9SSiPbnF Jlb/8Yg0N6dsleIKQsp6aL4z4Tmp1NK4+q6ZtBAzRDstJZGWZ9BZ6qsM1EmErsR4T4sA X+Fg== 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 e15-20020a50ec8f000000b004221164fb5fsi11350301edr.200.2022.05.02.08.08.13; Mon, 02 May 2022 08:08:13 -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 A531D68B092; Mon, 2 May 2022 18:08:09 +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 1D5BD68AE10 for ; Mon, 2 May 2022 18:08:03 +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 1nlXeV-0002aR-Eo for ffmpeg-devel@ffmpeg.org; Mon, 02 May 2022 17:07:55 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id lXY6nEqZ9SgGFlXeVnFLdv; Mon, 02 May 2022 17:07:55 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id lXeFnDatM8eSWlXeFne7TB; Mon, 02 May 2022 17:07:39 +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=626ff3cb a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=cQqIufYjY2mRxAesk6gA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 2 May 2022 17:07:39 +0200 Message-Id: <20220502150739.15364-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfB/UFLdTkg7ULKXLWSnU/skwrlrfiAuL/3juFrTfQFnxEUCeT3s/d+fcsPbkOUSg4MON3nRYZgkmB1DZ4C1whF+nSKZPI8YmPdVJ4pWOPyuKOixtjsWB 7t3b4sh7zz4mYgrT9R4f4RAiUdZZFZ126X0ZhYaAj4z1phcwQoDgNHReCRuRsp/aN/gPBIbzrvQPsg== Subject: [FFmpeg-devel] [PATCH] avcodec/sbrdsp_fixed: Fix integer overflows in sbr_qmf_deint_neg_c() 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: 9k8NS+ThtjM6 Fixes: signed integer overflow: 2147483645 + 16 cannot be represented in type 'int' Fixes: 46993/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-4759025234870272 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/sbrdsp_fixed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/sbrdsp_fixed.c b/libavcodec/sbrdsp_fixed.c index 43fcc90ae5..0d34a2a710 100644 --- a/libavcodec/sbrdsp_fixed.c +++ b/libavcodec/sbrdsp_fixed.c @@ -114,8 +114,8 @@ static void sbr_qmf_deint_neg_c(int *v, const int *src) { int i; for (i = 0; i < 32; i++) { - v[ i] = ( src[63 - 2*i ] + 0x10) >> 5; - v[63 - i] = (-src[63 - 2*i - 1] + 0x10) >> 5; + v[ i] = (int)(0x10U + src[63 - 2*i ]) >> 5; + v[63 - i] = (int)(0x10U - src[63 - 2*i - 1]) >> 5; } }