From patchwork Tue Jul 20 20:29:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28985 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp5658705ios; Tue, 20 Jul 2021 13:37:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyj1KLzdJJXiZt1J0afJN+dpU89VFR+3XD6tbC8FKY0OyrK2vG5kTs+oldsvffBIHYtHCUV X-Received: by 2002:a17:906:c107:: with SMTP id do7mr34963842ejc.469.1626813434682; Tue, 20 Jul 2021 13:37:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626813434; cv=none; d=google.com; s=arc-20160816; b=XubpB1rqcCYOQJ8XkvE+fcsuJ6/nkfaibbos6dk6D0zj4mC1zCV1e10HeNSnVhnqcu vgw62BkIPHKGrTjg8gbrrJMcik1nTzqUF8n6+R1iwxBV62292pJ+SJ6uwTR69sTPajzb hQY12qw8Z2xmzQyUFi9dzGRyZiCZ5+Eq6YQ4MR2imKDrt6pbTkTSkED6teYg2XEelTZS fsBqAx2pFKK+wTOllWaf3BY9hO/2j6cg1PSMI/kabvmghyggL7GdbYBgu2Zm7KCZ9+V7 qMhWrVJNpVAKp8ecPHAuQBjF3V37fFaji5ufjiIrdspWS570ooB/T5CWor5Ihk8aLFyA L6TQ== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=0hXalosy76Cv8Z/UgmIpTrsfudrmRtPbeHG6M6WSr9M=; b=ktDrj/F0BrCUJnMcHEZ8AZW3W6TiLrPTotbNDJiFNvBIJngYp9Qy1eXxbhtt3MQkyt e8gnwAvqQblllxhI+punfgXAfMtIKm2GoLXYX8c7KdyGb0tWQ4LA90rxZNWavhK1KfCz 6xXwFxiWVRXjIi3OVORgUEnTeDy/U/iM0QlQJ2XeasUg6kdmce5iYWeiaNRuQdcKiIVb yDuboMaicOBL1vi/pudd1hO/Oa7RmerOaoBKSInmv47M3Glt1uEW6VAm4ObhZX9iNgeW rLShdtnZG513ZSrNIsJqDXY6SDXyjtiRiBcbiVvwgXx9UwAnaMyvSqU2uNacvRbTadnR f9Aw== 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 t1si692819edd.382.2021.07.20.13.37.14; Tue, 20 Jul 2021 13:37:14 -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 59C0C68AA4A; Tue, 20 Jul 2021 23:37:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BF59689E56 for ; Tue, 20 Jul 2021 23:37:06 +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 1m5wO3-009hxl-0E for ffmpeg-devel@ffmpeg.org; Tue, 20 Jul 2021 22:30:43 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 5wN5mFNedljeH5wN5mRWkS; Tue, 20 Jul 2021 22:29: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=BoHjPrf5 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=uvVtbdjT_8Hk_rnc5QEA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Jul 2021 22:29:41 +0200 Message-Id: <20210720202942.8574-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210720202942.8574-1-michael@niedermayer.cc> References: <20210720202942.8574-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEwUiH3ZSFrn+ZnK/S5uVhxNoP+CJ4LremiwY4nHe7REYpgFl3KH5goaaSNtJLrRJLQvWxz4sQgjmGfwMcyNZmxo/wPFjdZKcgvRw+ruQ0tF7A6vSMfR C45qFAGN1ioxLOh2E840WjggqwSed73GM2RZm0+sa7Qly1TGwYhmoSjd Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/apedec: Fix integer overflows in 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: dPPY683AVt+V Fixes: signed integer overflow: -2146255836 - 197885745 cannot be represented in type 'int' Fixes: 35911/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5799270526615552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apedec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 022a6f9398..2bbc18fee0 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -909,22 +909,22 @@ static av_always_inline int filter_3800(APEPredictor *p, return predictionA; } d2 = p->buf[delayA]; - d1 = (p->buf[delayA] - p->buf[delayA - 1]) * 2U; - d0 = p->buf[delayA] + ((p->buf[delayA - 2] - p->buf[delayA - 1]) * 8U); + d1 = (p->buf[delayA] - (unsigned)p->buf[delayA - 1]) * 2; + d0 = p->buf[delayA] + ((p->buf[delayA - 2] - (unsigned)p->buf[delayA - 1]) * 8); d3 = p->buf[delayB] * 2U - p->buf[delayB - 1]; d4 = p->buf[delayB]; - predictionA = d0 * p->coeffsA[filter][0] + - d1 * p->coeffsA[filter][1] + - d2 * p->coeffsA[filter][2]; + predictionA = d0 * (unsigned)p->coeffsA[filter][0] + + d1 * (unsigned)p->coeffsA[filter][1] + + d2 * (unsigned)p->coeffsA[filter][2]; sign = APESIGN(decoded); p->coeffsA[filter][0] += (((d0 >> 30) & 2) - 1) * sign; p->coeffsA[filter][1] += (((d1 >> 28) & 8) - 4) * sign; p->coeffsA[filter][2] += (((d2 >> 28) & 8) - 4) * sign; - predictionB = d3 * p->coeffsB[filter][0] - - d4 * p->coeffsB[filter][1]; + predictionB = d3 * (unsigned)p->coeffsB[filter][0] - + d4 * (unsigned)p->coeffsB[filter][1]; p->lastA[filter] = decoded + (predictionA >> 11); sign = APESIGN(p->lastA[filter]); p->coeffsB[filter][0] += (((d3 >> 29) & 4) - 2) * sign;