From patchwork Sun Jul 22 20:23:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9775 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp5028984jad; Sun, 22 Jul 2018 13:23:51 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf3zEq1QSR5c5fkb09NKsxk+qQ0I75i98D/OiI8hf0Pie8ts5jeemmrk6sL4pvyLwb+tkho X-Received: by 2002:a1c:9e4d:: with SMTP id h74-v6mr6270595wme.70.1532291031008; Sun, 22 Jul 2018 13:23:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532291030; cv=none; d=google.com; s=arc-20160816; b=CDczlADs3//q72YvFZBtpSt2+Xr1rp3bHuXAZ8lCtj77WYgiSIHwONJOrroAWPAGja F9DMZuRREkPzeQF/g8NkQGZm4UYTPYxR5x47J4jeNimV+4/3TMGPEZP2gZHVmXrPP8cZ RckUlV5qhWCrC8mGKuienP/7ejWj851whKD/VXnsTOqscc8eNuRC3y8bSsJ/l0v4vKLI vecJuxpaTdxgab2Y/muYo0PHL/4RAIeQ4V0r4bll941ZWCgvwz1F+GQb6v8Cuoxl26dL Ub5ozE8cRdM1jTd868cdcxJDAzOsIaGBrk6CrWJL1QM65G5qZasc2SyAhwHnBiSGN/vm Shsw== 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:arc-authentication-results; bh=zoEP+g/g4aY8x/1Y0wK2C2NxVs4RGrUkM9Mtj6vQ3/Y=; b=NGm5ObzkNOqKIJ0+Xstg6STEsmbi1fdN0tWhjdQ8rDKBEttj9TlF6PIAz8Tk4CJFWM eKN5of5YPkJv7YBa2DT9hMGS0CKIIh4sJ2hPfPa871XxifbTzw6LU9fivECJDJWgSx9s L5vn/UnnlDEfZQByY2n4t60yneulAsha5kKyifcYm4bI2svEcuz2IWiiJQ5f9k6PcM0S jkRZoaKi7ry/ZYjGGTPB5empv+AUWIDMYUISCicPZ1dyWGcwvtQrmXT10/rC4GmtAOBp RPgKYhZIpckllSaJshS+/WmNPyE8cfyRmhXOtnCc+d+LKBXpwG6fYd0DbR/0tBaFP1/B BTCw== 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 x72-v6si4900537wmf.140.2018.07.22.13.23.50; Sun, 22 Jul 2018 13:23:50 -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 69F7F689DFA; Sun, 22 Jul 2018 23:23:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2091689B63 for ; Sun, 22 Jul 2018 23:23:28 +0300 (EEST) 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 1fhKtJ-0007BK-9e for ffmpeg-devel@ffmpeg.org; Sun, 22 Jul 2018 22:23:41 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id DwPg1y00B0S5wYM01wPhld; Sun, 22 Jul 2018 22:23:41 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 22 Jul 2018 22:23:19 +0200 Message-Id: <20180722202322.31933-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180722202322.31933-1-michael@niedermayer.cc> References: <20180722202322.31933-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/dirac_dwt_template: Fix several integer overflows in horizontal_compose_daub97i() 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: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 8926/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-6047609228623872 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c index 2369c8d15b..5d55d932a1 100644 --- a/libavcodec/dirac_dwt_template.c +++ b/libavcodec/dirac_dwt_template.c @@ -190,15 +190,15 @@ static void RENAME(horizontal_compose_daub97i)(uint8_t *_b, uint8_t *_temp, int // second stage combined with interleave and shift b0 = b2 = COMPOSE_DAUB97iL0(temp[w2], temp[0], temp[w2]); - b[0] = (b0 + 1) >> 1; + b[0] = ~((~b0) >> 1); for (x = 1; x < w2; x++) { b2 = COMPOSE_DAUB97iL0(temp[x+w2-1], temp[x ], temp[x+w2]); b1 = COMPOSE_DAUB97iH0( b0, temp[x+w2-1], b2 ); - b[2*x-1] = (b1 + 1) >> 1; - b[2*x ] = (b2 + 1) >> 1; + b[2*x-1] = ~((~b1) >> 1); + b[2*x ] = ~((~b2) >> 1); b0 = b2; } - b[w-1] = (COMPOSE_DAUB97iH0(b2, temp[w-1], b2) + 1) >> 1; + b[w-1] = ~((~COMPOSE_DAUB97iH0(b2, temp[w-1], b2)) >> 1); } static void RENAME(vertical_compose_dirac53iH0)(uint8_t *_b0, uint8_t *_b1, uint8_t *_b2,