From patchwork Fri Sep 17 19:56:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30313 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2511801iov; Fri, 17 Sep 2021 12:57:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyK5Eku8WkSEbhhfApAZBTX5j2CUlg4S513Al+DssvIeFWt2PYco0bvkwLb/MTTTeT8G/S X-Received: by 2002:a05:6402:19a7:: with SMTP id o7mr3726937edz.360.1631908658634; Fri, 17 Sep 2021 12:57:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631908658; cv=none; d=google.com; s=arc-20160816; b=KkD64UgK7G8hEKFyY6sTrUNIyx9GNn3XNrTEiY416BVQSfmyoJHmqajF+WRL+o9L0J N69gGzaf6JMsjx7NLHl7eqErFx79zpysEHrabsMJGJ6sMsObHFKOnNhLAjfeLeDhbhpW 7R+13oPwdumPgRzuwrLtMsuZnpVy40twqQ9npZNDaHlGGe0YtSajl9H7yAysgLicZscH N7Ok1CCpakdf2mJyoydgF/Zaa69vzxbE2u4LkW47XTAzUyRHMUkP/um0qpqFin/H3X2t 3lZH487dT3JusvCXkLnYobn9NXzkkHWlhKEXagbOGeqJv0Yj0y246+H/ViSZKkD+I5yL j3KA== 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=gt0NOH/4FQS8CsT4MsPeAdBXo1CxoW62Th5lYLVnKbg=; b=UrO8WUQrSjxWOQ5HKSJnSPuFEnzfPaGQ2O0elNoiAD8oD0pU/bhpVnuVouLdQCgCgM /BqcmOI9L+U83Zs1aeFXPu5UsunfCy/V3JALzQQM7nvZod3kJqMeCDltNhBpwSQ9jq91 ffI2/We4CwIeq+/AIAsmJcOFqf2aHDmzPVqLJvs02LyZGITqzZTmuwdIKtpxIKAmTo5U ORQ4xTngVQF0SGGui74ffOA3fAM/j1WWTM5tIQTmMaWwd2wXCO7G9YmH5qjuq9WLG8W2 Q8hY2FlJiSz0N3Otcy9/5jfh+uNSuzIqWyYaK3r+auUpD6bfqQzfMPnptZ7wpbGZ/7jg j9eQ== 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 ne41si8062909ejc.565.2021.09.17.12.57.38; Fri, 17 Sep 2021 12:57:38 -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 12AE868B0F3; Fri, 17 Sep 2021 22:57:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC94D68B0F3 for ; Fri, 17 Sep 2021 22:57:17 +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 1mRJz3-001Z3t-0H for ffmpeg-devel@ffmpeg.org; Fri, 17 Sep 2021 21:57:17 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id RJy5m6NWfljeHRJy5mufDM; Fri, 17 Sep 2021 21:56:17 +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=42JJjx2Omx0aMyeJof0A:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 17 Sep 2021 21:56:15 +0200 Message-Id: <20210917195616.25061-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210917195616.25061-1-michael@niedermayer.cc> References: <20210917195616.25061-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDRdcJI1BQsvfACCGoj2fsI1m1Eltg9dnbuZkuqeg6uxhms2fhzwoc+L0wAFOY9eNN4qLcKhc3OhQfz30GaWadgRXsuz+zKHCf0g1DdRsRgtdM00QRwe VA3rzx9p+Jh92ooscpkww2yj7Sud4ZxrlzxQr6SMwZvDhu366Nz4vFf6 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/apedec: Fix integer overflow in filter_fast_3320() 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: 7BJsz5rg229l Fixes: signed integer overflow: 2145649668 + 3956526 cannot be represented in type 'int' Fixes: 38351/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-4647077926273024 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 050523601d5..27d0ff35655 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -879,7 +879,7 @@ static av_always_inline int filter_fast_3320(APEPredictor *p, } predictionA = p->buf[delayA] * 2U - p->buf[delayA - 1]; - p->lastA[filter] = decoded + ((int32_t)(predictionA * p->coeffsA[filter][0]) >> 9); + p->lastA[filter] = decoded + (unsigned)((int32_t)(predictionA * p->coeffsA[filter][0]) >> 9); if ((decoded ^ predictionA) > 0) p->coeffsA[filter][0]++;