From patchwork Sat May 20 21:01:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3703 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp827079vsk; Sat, 20 May 2017 14:01:35 -0700 (PDT) X-Received: by 10.28.10.6 with SMTP id 6mr20004730wmk.5.1495314095158; Sat, 20 May 2017 14:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495314095; cv=none; d=google.com; s=arc-20160816; b=AnwT0lkQG/ZJYdLALeUFXiHtXtER1JM5xTR9nbrYAipK8m9IQ5Pr2JmfQxXUgXEs3r 1iXKNo3hcXAMfnSvBq/DYO+v2XaiIeGjIUqGGYZCBLhbWINCmcyj2lKgBMoseg6eO9BH CRzUp5htctYWHXwopyjo21ml33pjIymVlqGQCzChYbthASr0xGNb3bnx4hqSQ2QKbHwn VNeCVqarv+hBrRKjjDlv3r40MxkIBAOXErjazr/yNQlQ5zaNUI23erLw9k1i04EWFMQz 5nsgXvfRuJSc4EYitCS4zRsiaDiLr8zggohn/oBvJTQfofKER6IKR4koizkAFs5srCs4 5qSw== 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=7058SAUDOTGIYno+sh0ckwHUWz1sFZlQBSuxW3dLZTE=; b=Dkhop1uwupdmSrPIc24AATfBxUEHE/+20Iiw311SOr1FEdAvhG9mnxH1d3zMa73Vtt 5ejmRST36xMKJks83m1o1/50NsgctRiAg0IHyqrCwXFdH6lMbTIzUVH64lhm9k+DSI2H x3ma0f7G9ajp77UzHFCfHhq5K8qBiLa95/UjTR3BPIJ7ZW4IyOKLmrS0E0Kp57LMjNb6 PzCJSARx/cSvIhST29fSG3SgYl7C8mukjv/K1vwGLlPXjf5tdOU79NqUHqdhSZSCE2LB TrcXLWYCEcTrt/BsIYK7rQiu1huXLJScQ1tnz5rSpITD9xRxsxxGuyBPIQIS7zw7xCmW 69fQ== 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 q78si29717528wme.139.2017.05.20.14.01.34; Sat, 20 May 2017 14:01:35 -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 0B38B689A0C; Sun, 21 May 2017 00:01:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 936B8689975 for ; Sun, 21 May 2017 00:01:14 +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 1dCBUx-0001u4-1v for ffmpeg-devel@ffmpeg.org; Sat, 20 May 2017 23:01:15 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Nl141v0150S5wYM01l15jf; Sat, 20 May 2017 23:01:06 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 20 May 2017 23:01:02 +0200 Message-Id: <20170520210104.4943-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/escape124: Check depth against num_superblocks 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: left shift of 66184 by 15 places cannot be represented in type 'int' Fixes: 1707/clusterfuzz-testcase-minimized-6502767008940032 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/escape124.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index c3174ce6ef..eb051eba54 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -267,6 +267,11 @@ static int escape124_decode_frame(AVCodecContext *avctx, cb_size = s->num_superblocks << cb_depth; } } + if (s->num_superblocks >= INT_MAX >> cb_depth) { + av_log(avctx, AV_LOG_ERROR, "Depth or num_superblocks are too large\n"); + return AVERROR_INVALIDDATA; + } + av_freep(&s->codebooks[i].blocks); s->codebooks[i] = unpack_codebook(&gb, cb_depth, cb_size); if (!s->codebooks[i].blocks)