From patchwork Sun Sep 5 19:24:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30011 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3156615iov; Sun, 5 Sep 2021 12:31:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxXJIXaz+Xf4A6FnekVEPcajotWn3/o4BObEgGpl0QIj5c6V3OO7ybHc6/RmrRpTouf4HS X-Received: by 2002:a17:906:9b87:: with SMTP id dd7mr10262720ejc.99.1630870306971; Sun, 05 Sep 2021 12:31:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630870306; cv=none; d=google.com; s=arc-20160816; b=ZjoOer8LJ01MLoggUONletde+Kk7tEYhISpRXUW6YbfBJyzAjSjexlFr4+Vj+mrnqK FSH4scXop0HmOxx+rUilitUx/RngUE/TmALKLULtbTYL+mZeTXVrRyt741+5ITnlCjV9 NK2Bj3vIEAQb3QrZogtJ8I3zxrdf+TkR0U7ypkgGEVOdj97Gt+ujRFqNX1BohU1bGyCt WSH3y/zJTyvvzthkE5kV+yZQkGEaghQde6un4nlbBRSlScrm8zSppRivb1H8E1o6xbjs ZAd7UNvM4h3PmjY9ZKeecOHT/M39vwzSTqk/Eq832KvZaqFWyruYi4hC23gt+NUPZ38M HsRA== 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=wpP+V9A3vJt37SUSp9c/8qvcmOKqCku5q5z+B4w0Kos=; b=Y9oEjhDHXCm6M9x8oG+xDcGS5IkuP9W6l1fPf3e9Qf6HNPb1Hh45DrUpwD1G8+Ulbb mnAh+Qpq/F5U7xvCd7YAkDTridu5ddu80yfjPO8hXNjiTA28liw3ot4sgyFdcweyStwA 2JdXZi3+6O36NSjCrkVllRVYlnVCRkg5z7wlW18PUm2cy5/F6e54EIKlv5s6Q8rK+Ua9 YCKlFmuPLBaruIPWhP/zh9p4gwg/9BPOpcqNpSCWnv9/n8Y2/Z7kDKgAM4BjkbUKzbTN 5lgMaX5gVskwIZ/Q+Hsefk9uOYMSSczfH2UbQFPavL8Jb24O4SgNFYVwXXcK4FLXPklZ etvw== 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 c72si6157093edf.101.2021.09.05.12.31.46; Sun, 05 Sep 2021 12:31:46 -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 D413168A67E; Sun, 5 Sep 2021 22:31:43 +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 B72806806F5 for ; Sun, 5 Sep 2021 22:31:37 +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 1mMxlW-009MU6-8O for ffmpeg-devel@ffmpeg.org; Sun, 05 Sep 2021 21:25:18 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id MxkYmmGJjljeHMxkYmkPFl; Sun, 05 Sep 2021 21:24:18 +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=HZGD4XvvAt8j1vcZr4UA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Sep 2021 21:24:16 +0200 Message-Id: <20210905192418.25970-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210905192418.25970-1-michael@niedermayer.cc> References: <20210905192418.25970-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJg/6YdBNNcXgRPbRd54Plv8bUq8I0GsOM4aReM1yfeoWxA+oe/Wo8/Ya5iikLvv0Ey6P+rTIp0jgztKeADkFwNyvYS2aEjZKNFQHisx9Xi0u4fkVC5y ET6TakizHLP4DwuX6bd9sBssntWjO6ApDJmr8G+S08PmFpQYylHcTGKA Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/apedec: Fix 2 integer overflows 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: vfQTqfgGXAhT Fixes: signed integer overflow: 1683879955 - -466265224 cannot be represented in type 'int' Fixes: 37419/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-6074294407921664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apedec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 022a6f9398..bf481ba354 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -909,8 +909,8 @@ 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];