From patchwork Mon Sep 18 00:54:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 5174 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp2953687jaa; Sun, 17 Sep 2017 17:55:16 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDKqts2/PEC+uLzFdf6LF4BhlH8+8Z6zF6xBFLi2Ri8Jmy6YnBxB8cRra4t2VtqDV2jYcmo X-Received: by 10.28.154.138 with SMTP id c132mr7040873wme.2.1505696116265; Sun, 17 Sep 2017 17:55:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505696116; cv=none; d=google.com; s=arc-20160816; b=Kf02/WchE1U6gTxQjfsWHGHfnIlbuaMJhqMlQNi/YNV3ms4/6hw84wLPomDjxKLWUR YNEAdlVyrbZ0q40JJahDTE7AHZ+19JE5Hj+Nko/Q5DUXgbUVC9cBcApMfQcU8vnkWgsB siKIyiN3Cl8AA9Oaa6/EQ/JpbA/Lp3NWCxN4v7gD23jabB9la7JMrVx2tcrCz3gjs0xK RW4jipoHMJsjKGsVB9REAHJQ1C1esF4MzUv1pdGvz475H/hQ7Xg4ads3Ob0aPf9fZ6Hf /nYegZKMOU8S5lxNpE2lJxBh1gzFqz9OZQLUYSzHTFTO+CWwSImFr1fhcIXHBNS1CA2F /ZkA== 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=2PkZ540p53VL6ybkE9WhD6reG+K8cl4RZaTqGvwwVSk=; b=JA1Q1o0bRWHAdjemkuH9sk6WGy/LaVD+WP7UWmQbazzeahHXWRCdgWo4Zi3BzQ9AfM Co5OTBIk22aTM1XMRM2LAKkssfX2VUHi/wZekUB0ChM3/kpLDLzGPwyp5ipQTBUX4Wtg 0HX0NMzF9FX17VxxAqrtY2/4tlj4J2Z7wpucZAKXnS1fX3M8o0dLpeSrpi31n28P4ryo J5gn4xuxzvp/7Km6dXGLCRDTCR3cklQrZteMFW3gObEP0jVWzYiIbhMC+Ql0IoYbG1Z/ AZEbC11z/HVFg1lfEk6fMJqe4OAG4wvNVG7nRcUMY15WHoaM8+bUIQgwCN3aCAx2h+oO OGFw== 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 40si4927260wru.74.2017.09.17.17.55.15; Sun, 17 Sep 2017 17:55:16 -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 C132C680A8A; Mon, 18 Sep 2017 03:55:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB7AA6808CC for ; Mon, 18 Sep 2017 03:54:58 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dtkL4-0003oT-OM for ffmpeg-devel@ffmpeg.org; Mon, 18 Sep 2017 02:55:06 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Aouz1w0110S5wYM01ov0Uq; Mon, 18 Sep 2017 02:55:00 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 18 Sep 2017 02:54:58 +0200 Message-Id: <20170918005458.5989-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH] avcodec/dirac_dwt: Fix integer overflow in COMPOSE_FIDELITYi*() 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" Fixes: runtime error: signed integer overflow: 161 * 13872281 cannot be represented in type 'int' Fixes: 3295/clusterfuzz-testcase-minimized-4738998142500864 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dirac_dwt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dirac_dwt.h b/libavcodec/dirac_dwt.h index adf5178714..755d5e5d2d 100644 --- a/libavcodec/dirac_dwt.h +++ b/libavcodec/dirac_dwt.h @@ -111,10 +111,10 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y); (b0 + b1) #define COMPOSE_FIDELITYiL0(b0, b1, b2, b3, b4, b5, b6, b7, b8)\ - (b4 - ((-8*(b0+b8) + 21*(b1+b7) - 46*(b2+b6) + 161*(b3+b5) + 128) >> 8)) + (b4 - ((int)(-8*(b0+(unsigned)b8) + 21*(b1+(unsigned)b7) - 46*(b2+(unsigned)b6) + 161*(b3+(unsigned)b5) + 128) >> 8)) #define COMPOSE_FIDELITYiH0(b0, b1, b2, b3, b4, b5, b6, b7, b8)\ - (b4 + ((-2*(b0+b8) + 10*(b1+b7) - 25*(b2+b6) + 81*(b3+b5) + 128) >> 8)) + (b4 + ((int)(-2*(b0+(unsigned)b8) + 10*(b1+(unsigned)b7) - 25*(b2+(unsigned)b6) + 81*(b3+(unsigned)b5) + 128) >> 8)) #define COMPOSE_DAUB97iL1(b0, b1, b2)\ (b1 - ((int)(1817*(b0 + (unsigned)b2) + 2048) >> 12))