From patchwork Sun Jan 7 22:13:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7188 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp1956027jaa; Sun, 7 Jan 2018 14:13:49 -0800 (PST) X-Google-Smtp-Source: ACJfBosBv9YQYR6q11RzNmqV1NOmtmG4Eu+sPu1epAlSIB7Q0uWCpBsk99isGkRkgrIzbuRA1YRJ X-Received: by 10.28.145.11 with SMTP id t11mr6666417wmd.22.1515363229386; Sun, 07 Jan 2018 14:13:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515363229; cv=none; d=google.com; s=arc-20160816; b=Lfi7eri43AExCqfEA/pBOV9uJ65t+BGu+gPWoXCPIpJ6Ng336+pJEI7kMpASorVYqC lThxU13iGyLXTTl24CsS5upgpxk7Swi1isWZ3Prv4pBfvL///jbj41LVjBMCrRVQFwyV hFf8bUcvE3wdr/Myu0zUBD1CNNHWE3aIKx6R5i3oemhgiixJDSG4UZ8WHWBpnReLDQlx OERjTsz6lQpgpFppAAkvfo0q1IkY2K5D2WFkqXKcQxtqqGGy0i9+aDmErDgYLTnP4mky 1lC7hBgcQmR+YoDO3C5u/lAkiuZhO9DmVJrJZ34n6bhT1i2UocyQVPvikzH5rjje2l7m 4cdg== 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=evGDbUZyMwsQvfHQB2Hh1AVvHbKRATfDai2XeNnP6WI=; b=YtXYIAvoZ6we+IGE8EG3u6zqKEfo+3hXqJsE2xoEUm0ctbTQKxUaDtlciov3f7Voy4 nddEJOfVR66qjaFqxcIvFqu0JfWfwJZYSfIb/AHm8UG4x5u93bua0rsRuEHJj/wqODkC 65CiQMMxs3Abz8AK8vf17Rr4O7TnKwMWzjGZe19Q1gB1ECNCGAITAlWMA/ZK11Air/Je d+oKNu7Xn5wZk+S8KCTk/SzKmbglVTNKocBoWuX4bBeXWy6k3Vhn9VjDsl+dC8B7czWb q7Qzzn/AWAL//XYl24JhMLOBQ4O30adgSKiJN27pFQL5y57mIk61ohGfBvRGzubXEt5L uoSw== 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 m19si6949150wrg.398.2018.01.07.14.13.47; Sun, 07 Jan 2018 14:13:49 -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 A907A689E53; Mon, 8 Jan 2018 00:13:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-1.mx.upcmail.net (vie01a-dmta-pe08-1.mx.upcmail.net [84.116.36.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A52E5689AB3 for ; Mon, 8 Jan 2018 00:13:39 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eYJCF-0001lv-Qy for ffmpeg-devel@ffmpeg.org; Sun, 07 Jan 2018 23:13:39 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id vaDe1w00g0S5wYM01aDfCE; Sun, 07 Jan 2018 23:13:39 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 7 Jan 2018 23:13:36 +0100 Message-Id: <20180107221337.23431-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/diracdec: Fix integer overflow with quant 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: 2 + 2147483646 cannot be represented in type 'int' Fixes: 4792/clusterfuzz-testcase-minimized-6322450775146496 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/diracdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 7157357d59..530e1c6ffd 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -509,16 +509,16 @@ static inline void codeblock(DiracContext *s, SubBand *b, } if (s->codeblock_mode && !(s->old_delta_quant && blockcnt_one)) { - int quant = b->quant; + int quant; if (is_arith) - quant += dirac_get_arith_int(c, CTX_DELTA_Q_F, CTX_DELTA_Q_DATA); + quant = dirac_get_arith_int(c, CTX_DELTA_Q_F, CTX_DELTA_Q_DATA); else - quant += dirac_get_se_golomb(gb); - if (quant < 0) { + quant = dirac_get_se_golomb(gb); + if (quant > INT_MAX - b->quant || b->quant + quant < 0) { av_log(s->avctx, AV_LOG_ERROR, "Invalid quant\n"); return; } - b->quant = quant; + b->quant += quant; } if (b->quant > (DIRAC_MAX_QUANT_INDEX - 1)) {