From patchwork Fri Aug 18 14:42: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: 4742 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp849819vsu; Fri, 18 Aug 2017 07:43:27 -0700 (PDT) X-Received: by 10.223.157.5 with SMTP id k5mr2537681wre.170.1503067407201; Fri, 18 Aug 2017 07:43:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503067407; cv=none; d=google.com; s=arc-20160816; b=x5D40gbIoX5rwNLm6v50jZLxfiaeO7DUPgAEkWX/0nyk5n9BuHsJ26hrvV/Qu0Nn26 nINm8f+SiXCHP3TfSks21eLq9pcwU1MrVho5o+opswOHWcFtIzoc68CT8AiJLPI2mKX/ aNdtgu9wLRMbu112ppxwb4HtaM08r7uCAG6fGE9vuk/jqUUb+01e9SwWmZoUMlgIMh2U 76hOk6gAE27khWmFWACrCmGBMKJYCqfm0UOW43HT2bily7oLXINZyT70wN2fpcz8NGaK z3qWuUAbIXp5Em5sR8FUCwaRpbD8b4Stbglc0luU8F8Y4PCDoLvN5WN7KkmU4/vsSDBA xl9g== 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=mdyZP1D1kfIqm6bW8s5ZCacCnGCOEWcbQdmKzxwSfdQ=; b=rcJu9lWQlCDMCBDHIwlrPd1mhoZ93zK5CYRhwAFjva9acMNX9uEBIaJB1mK5syPb7i o4Cpl+m2EHJYp3oWUJH8ZIcWEY6YrzZrgToAyoXyZ58EzfBLC31Pq3+oFPgyzdHN8XLA x6XqSJSuqQ2/qePNHoB+T/vPIw/zSlSzDNtrxcVaTafgowyOQkCmJwkJq1yRUyytDbIT 1sN5sGIuqqYxc3q6VGyNonADkr0DJx/LPEiDNt/XtPMwgD3O+M/Q2238f8Y3432dp8n8 NnoAoj2D93rbpCX7zD/pI7WHobHX+y+XbGy9WX4C7atowNB2C9MMscgMQzCkt+9XaHQP 7xSA== 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 n21si4481475wra.516.2017.08.18.07.43.26; Fri, 18 Aug 2017 07:43:27 -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 587B2689913; Fri, 18 Aug 2017 17:43:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24D4F6898B0 for ; Fri, 18 Aug 2017 17:43:04 +0300 (EEST) Received: from [172.31.218.43] (helo=vie01a-dmta-pe05-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1diiUP-0005De-J2 for ffmpeg-devel@ffmpeg.org; Fri, 18 Aug 2017 16:43:09 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1diiUJ-0004ip-Ut for ffmpeg-devel@ffmpeg.org; Fri, 18 Aug 2017 16:43:03 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id yeiz1v01j0S5wYM01ej0aZ; Fri, 18 Aug 2017 16:43:00 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 18 Aug 2017 16:42:58 +0200 Message-Id: <20170818144259.31742-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/dirac_dwt_template: Fix integer overflow in vertical_compose53iL0() 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: 2147483646 + 2 cannot be represented in type 'int' Fixes: 3013/clusterfuzz-testcase-minimized-4644084197097472 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dirac_dwt_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c index 972c711cff..e436c247a1 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] -= (b0[i] + b2[i] + 2) >> 2; + b1[i] -= (int)(b0[i] + (unsigned)b2[i] + 2) >> 2; } static av_always_inline void RENAME(interleave)(TYPE *dst, TYPE *src0, TYPE *src1, int w2,