From patchwork Tue Aug 15 01:32:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4707 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp5003317vsu; Mon, 14 Aug 2017 18:32:57 -0700 (PDT) X-Received: by 10.28.109.146 with SMTP id b18mr377566wmi.34.1502760777884; Mon, 14 Aug 2017 18:32:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502760777; cv=none; d=google.com; s=arc-20160816; b=e2n5euRj347HECH/JLsvnYxbBNG1ytab9PzjYwKS/t0/4+o4uhM4RKuB+ZpXHHP2RQ MV/P+eXphm/rGKjhP/yO2EJImY4Q/snq2YOelvk+6Zon45RyL5vnG0F0v2N4bxbowaFA hwSCeD2kxcOZvClbuBLpXtGOelJA565LmBlj9Xm4Wz5WobvjReti0HPIl6P8XCW4GZCs Ih1qreqUOKITg/j/+2KyL2H5nAUG4UWHE0mslkzuesiitJo83T5NLEBB5HyDOLF2zODZ RiuCpmuFj8QpD4qERhJCtr7h3+jClvXUw/lnZMkAT8YTKbkyhGBm50PG+OU9JlAjZ1AR AvkQ== 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=G0aPCvM29K0aN4FCTieSY4m8X4sdIgBpTwaOyuRbiNc=; b=SU/y7SbyxFr181MgLTi7B0om/UQBVfOGFS0Dlb+m0MXtkKq/3A3cCEY9lCHJJpVzWN BFnGPQu6DZxeDhKYl/TT0fwfHxddBpO112e9JKXhAem0o7yoRwNYDgRbknVfkS+FPDSh CNpCh4+uiL2voYWQrOQQkPNDEgJIInSIrr9ld76AvJe0Qh7CZxy6oqSW399Mm/QxjJys QpMkaZ6G5rwdnn1LRxA06gFnRvBouS0cIyKaJgg1vP0lbSzTj1ddHosGi0NwoIOmJx6C 2KL2Pl6sTBItK8lvwM/7tjhhN58NBUsP0nSgwuXuvlghg5gMBsyHtBLNoe+WiXx9yODq 8mcw== 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 c11si432409wmh.272.2017.08.14.18.32.57; Mon, 14 Aug 2017 18:32:57 -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 0FD9A689D37; Tue, 15 Aug 2017 04:32:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-1.mx.upcmail.net (vie01a-dmta-pe04-1.mx.upcmail.net [62.179.121.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A4B1689A46 for ; Tue, 15 Aug 2017 04:32:43 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dhQit-0000ig-53 for ffmpeg-devel@ffmpeg.org; Tue, 15 Aug 2017 03:32:47 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id xDYk1v0180S5wYM01DYlZu; Tue, 15 Aug 2017 03:32:46 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 15 Aug 2017 03:32:43 +0200 Message-Id: <20170815013244.21614-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/diracdec: Check perspective_exp and zrs_exp. 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: undefined shift Fixes: runtime error: shift exponent 264 is too large for 32-bit type 'int' Fixes: 2860/clusterfuzz-testcase-minimized-4672811689836544 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/diracdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index f2837aca69..be8b282314 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1161,6 +1161,11 @@ static int dirac_unpack_prediction_parameters(DiracContext *s) s->globalmc[ref].perspective[0] = dirac_get_se_golomb(gb); s->globalmc[ref].perspective[1] = dirac_get_se_golomb(gb); } + if (s->globalmc[ref].perspective_exp + (uint64_t)s->globalmc[ref].zrs_exp > 30) { + av_log(s->avctx, AV_LOG_ERROR, "exp %d %d too large\n", s->globalmc[ref].perspective_exp, s->globalmc[ref].zrs_exp); + return AVERROR_INVALIDDATA; + } + } }