From patchwork Sun Aug 6 03:01:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4633 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp1293626vsu; Sat, 5 Aug 2017 20:10:14 -0700 (PDT) X-Received: by 10.223.149.65 with SMTP id 59mr4638994wrs.292.1501989014850; Sat, 05 Aug 2017 20:10:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501989014; cv=none; d=google.com; s=arc-20160816; b=j/Ec1h/zkA3BHJPSN2Sh1G3GlUGeVLbX4CxbLzgLeNTkgr+VHsVdlxlUcIXHfh3VjB 0a3Mo+4U521wO9XIg9qkFjaSGlUd8n9lXXXKYSDOzm6OreawLlOfM1JS9wgQl3a4YOIL VfysyevbIiXPyegUeYhH1Rhj8LFpS9ypQYTw5gB7Q83umSyPxbm4aGxNTH8CoRREfT58 MBqeLYOUoOvY/MsVq/I6IozlpFM3MwOPxbqO2LP1ulcacaEaHtmQOguTZs0mkXg0j6nA 7QPv9f2nsffJCLMHO6mlDf6FTHQdrsH6pJiEhcLopU+AnggCSKxMJRUP00InybGNIWWC qJjg== 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 :arc-authentication-results; bh=g+ttD+e0JzaENPUE3QiWdBfXnrPpp9bZlcKcmu28cyo=; b=b7aSh/UB+ucNfV0b/k1Rc84xnpmDR7r4VN2LOHyGyUjkpOrf2RuoD726qdakQnU14i YnY5OL4QE88xVsNu8cldpklS5xMRP+lwY/NGixbP37vXRDVYL+fvcgDpkDOlzY7lZtol ITu33SfOlcriIn7zXxeiZ/usDiFIZF5OfZtsl6+BJ+uE38yL+l5xmrQppJvEY1YZMQ26 yZK3cpob/UM7MVHykY5Jw/7r2LdJ11j/1daDC+ChW/qc4masX+2OcOFzPiOehEbWUf5F A1zbsleMzosS8ddHsiwtVg6dlXkiW9DjNDgIx51XuJPKX2onqSqB4cdiLJjcyJV+Zyvu TZZg== 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 m205si5370621wmf.159.2017.08.05.20.10.13; Sat, 05 Aug 2017 20:10: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 A327B6891FC; Sun, 6 Aug 2017 06:10:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-2.mx.upcmail.net (vie01a-qmta-pe02-2.mx.upcmail.net [62.179.121.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EA72688363 for ; Sun, 6 Aug 2017 06:10:02 +0300 (EEST) Received: from [172.31.218.40] (helo=vie01a-dmta-pe04-1.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1deBx5-00058m-1D for ffmpeg-devel@ffmpeg.org; Sun, 06 Aug 2017 05:10:03 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1deBwz-0003Qs-1s for ffmpeg-devel@ffmpeg.org; Sun, 06 Aug 2017 05:09:57 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id tf1l1v00y0S5wYM01f1mDM; Sun, 06 Aug 2017 05:01:47 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 6 Aug 2017 05:01:45 +0200 Message-Id: <20170806030145.11463-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH] avcodec/dirac_dwt: Fixes integer overflows in COMPOSE_DAUB97* X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Fix multiple: runtime error: signed integer overflow: 6497 * 3409630 cannot be represented in type 'int' Fixes: 2819/clusterfuzz-testcase-minimized-4743700301217792 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dirac_dwt.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/dirac_dwt.h b/libavcodec/dirac_dwt.h index 62f8472b41..e715e53bc4 100644 --- a/libavcodec/dirac_dwt.h +++ b/libavcodec/dirac_dwt.h @@ -117,16 +117,16 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y); (b4 + ((-2*(b0+b8) + 10*(b1+b7) - 25*(b2+b6) + 81*(b3+b5) + 128) >> 8)) #define COMPOSE_DAUB97iL1(b0, b1, b2)\ - (b1 - ((1817*(b0 + b2) + 2048) >> 12)) + (b1 - ((int)(1817U*(b0 + b2) + 2048) >> 12)) #define COMPOSE_DAUB97iH1(b0, b1, b2)\ - (b1 - (( 113*(b0 + b2) + 64) >> 7)) + (b1 - ((int)( 113U*(b0 + b2) + 64) >> 7)) #define COMPOSE_DAUB97iL0(b0, b1, b2)\ - (b1 + (( 217*(b0 + b2) + 2048) >> 12)) + (b1 + ((int)( 217U*(b0 + b2) + 2048) >> 12)) #define COMPOSE_DAUB97iH0(b0, b1, b2)\ - (b1 + ((6497*(b0 + b2) + 2048) >> 12)) + (b1 + ((int)(6497U*(b0 + b2) + 2048) >> 12)) #endif /* AVCODEC_DWT_H */