From patchwork Fri Jan 26 01:56:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7416 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp90072jak; Thu, 25 Jan 2018 17:56:55 -0800 (PST) X-Google-Smtp-Source: AH8x227JjWdWX+B/uR2MoGtDkpyiUt9NBin9WLmmbhyCKqL7BJ5GfvXwL5UKQy+S52vbjUdtHU7U X-Received: by 10.28.61.68 with SMTP id k65mr8689881wma.147.1516931815177; Thu, 25 Jan 2018 17:56:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516931815; cv=none; d=google.com; s=arc-20160816; b=fe7AhCA/2UrDjjy8SZt4gIFNPcUL0vLpgvDEx3SSuJTU/3Pui+rYbxKcz6hacGodRA 9edMhDVJ0+Ysv1YLEzKw6jC5jHJNFXyR6cYqwk03CDPtsFZLmgQk8DaP/wMZhVfBX3dk 4xTxk46qZFIdwl986gWCrr+eWhO/HOPm5l/XdMtnzWF2OsnuoX9jslMQxqfVyLBPMO/F 6Idt8hSiOx5GK1fIKgx/GVrjJJ1P84M5vDMRdH+42AfyFyZYLx8afoRc3eYlOpA7Hlff USHsEIGKqJDb3LxcpuXXQp/LFnn9OSf6Z85FBJNDGsjx/Tpl1TinBDxPAYHpSGgn3b2L V8fQ== 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=xJ2nUHUMaiRImKbPdvdnGd+CkATV8OS+qhprZIDNpgk=; b=tBOGiW7q9vhef+jV1pNFI92fBwOPgLWM0IZatXdgCq3ZZ/nTXqhecAup9ko1/X/vos ATVKWHyJcTHjrTsdDJeYMrDtvo2uYwbmcux/z/7HiTWmdl9huLO1yEM2FMsN6ygwn4/9 0Iman8ngZpu/pSZTGaiSgujYa3VoGSej+JlU2/AaJLNpq9db8ioPwPnasuKukwI/JQIV xGQiBpO8oH+Kp3URcB0iccLXP2HKY9quvi+lWaZmhpq2qrFTW3gWUzp5WKD4jjIywAIO KrBPGDRAs7R+Dcehsr1mipdU46CugTve0FynsbAnarARARVEsF8N506oMrf4K4u35GdE 009Q== 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 c78si1725441wmd.78.2018.01.25.17.56.54; Thu, 25 Jan 2018 17:56:55 -0800 (PST) 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 A5A15688366; Fri, 26 Jan 2018 03:56:44 +0200 (EET) 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 BB3BC68825C for ; Fri, 26 Jan 2018 03:56:38 +0200 (EET) Received: from [172.31.218.37] (helo=vie01a-dmta-pe03-1.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eetFx-00029x-Gu for ffmpeg-devel@ffmpeg.org; Fri, 26 Jan 2018 02:56:41 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eetFr-0005RE-Ot for ffmpeg-devel@ffmpeg.org; Fri, 26 Jan 2018 02:56:35 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 2pwX1x00e0S5wYM01pwYqT; Fri, 26 Jan 2018 02:56:32 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 26 Jan 2018 02:56:29 +0100 Message-Id: <20180126015630.3998-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/dirac_dwt: Fix several integer overflows 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: -2146071175 + -268479557 cannot be represented in type 'int' Fixes: 5237/clusterfuzz-testcase-minimized-4569895275593728 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 ++-- libavcodec/dirac_dwt_template.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/dirac_dwt.h b/libavcodec/dirac_dwt.h index 1af41e0702..68ebd19560 100644 --- a/libavcodec/dirac_dwt.h +++ b/libavcodec/dirac_dwt.h @@ -93,10 +93,10 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y); // shared stuff for simd optimizations #define COMPOSE_53iL0(b0, b1, b2)\ - (b1 - ((int)(b0 + (unsigned)(b2) + 2) >> 2)) + (b1 - (unsigned)((int)(b0 + (unsigned)(b2) + 2) >> 2)) #define COMPOSE_DIRAC53iH0(b0, b1, b2)\ - (b1 + ((int)(b0 + (unsigned)(b2) + 1) >> 1)) + (b1 + (unsigned)((int)(b0 + (unsigned)(b2) + 1) >> 1)) #define COMPOSE_DD97iH0(b0, b1, b2, b3, b4)\ (int)(((unsigned)(b2) + ((int)(-b0 + 9U*b1 + 9U*b3 - b4 + 8) >> 4))) diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c index e436c247a1..e68cc4d530 100644 --- a/libavcodec/dirac_dwt_template.c +++ b/libavcodec/dirac_dwt_template.c @@ -49,7 +49,7 @@ static void RENAME(vertical_compose53iL0)(uint8_t *_b0, uint8_t *_b1, uint8_t *_ TYPE *b1 = (TYPE *)_b1; TYPE *b2 = (TYPE *)_b2; for (i = 0; i < width; i++) - b1[i] -= (int)(b0[i] + (unsigned)b2[i] + 2) >> 2; + b1[i] -= (unsigned)((int)(b0[i] + (unsigned)b2[i] + 2) >> 2); } static av_always_inline void RENAME(interleave)(TYPE *dst, TYPE *src0, TYPE *src1, int w2,