From patchwork Tue Oct 2 01:04:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 10615 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp2324981uaq; Mon, 1 Oct 2018 18:06:02 -0700 (PDT) X-Google-Smtp-Source: ACcGV61nkDEPtltz1e6auN1+tx8cq10Li4vmmuTgIv0eM954p9rUW15ObFCjsiBZ6f+jseH+1OMj X-Received: by 2002:a1c:8e81:: with SMTP id q123-v6mr282110wmd.56.1538442362466; Mon, 01 Oct 2018 18:06:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538442362; cv=none; d=google.com; s=arc-20160816; b=d+D/9Q5u+a2fcaz96KNMUfhCXfNfZ1phMLPAEipNYfu7N4yn/kE03Fex6NDPkAnD+j OHC+p+HBoq//mYHQ8bAKNHMWtYuMYMZlOaGlj6Brk3xNBXm+IvRzSU3OI1kVREmazC6B /q3GC406K44NUluVd9VjJ7s9XLroRMTZu4BVAA1aOITF4hItgn3YDxbF8fbyBjb21t8I e8bE0mTgZ7u20FKCgnm7kD51+enUL0KuDtrfpdscNJ5mkXTv1GgD12us89U2yYoHBZUQ Ifswx/TZapYWHzLSpCGmihq7fKmLYGCjqBZU03PBUUv/mKgPDP6k/fop3bSRrLpCRggB Ywrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=9Tw6N3T7sSLxn7xLTepgN7qNvpDu2uWcHXW62fG9Fvg=; b=qty6tQ2j4xWofClXssGGBi2DfuFhLwATnD7dk2ciZYOywmXXjKsTsSWTvNDkgErGKq PgU93jiu65q+ySaSvvdFekVj/sF3hgoy7D9wtdkQyuq05WSRB6UzaPBbTw8woYKCN6Mg 1h3HmEvaK96F9I/a3F2rvkkIDfn3cJPXLP3bBo+lINek1vEQvsi9PJfdNOz2saxgDRis 3MN/JidRxl9setsBe1YOjWLsrm+dFUhpR7K7/eVMwMHoxHDnbJyvySu0BUNnnvUKSLjj EFqUkHfSgKWwxLEVcsRxlHVMA4h0rsZTf+Y/mArA/DB/osQcmcNHfJFr+UIxDRGhv5h8 Lq/A== 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 71-v6si13374628wrl.431.2018.10.01.18.06.01; Mon, 01 Oct 2018 18:06:02 -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 C262B68A145; Tue, 2 Oct 2018 04:05:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61BA668A129 for ; Tue, 2 Oct 2018 04:05:34 +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 1g798K-0002Q3-O4 for ffmpeg-devel@ffmpeg.org; Tue, 02 Oct 2018 03:05:52 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id iR5p1y00T0S5wYM01R5qzJ; Tue, 02 Oct 2018 03:05:50 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 2 Oct 2018 03:04:50 +0200 Message-Id: <20181002010452.12356-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/tiff: check remaining packet size for strips 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: Timeout Fixes: 10280/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5676217211027456 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index cfe0c27714..b537ec06a5 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1303,6 +1303,7 @@ static int decode_frame(AVCodecContext *avctx, planes = s->planar ? s->bppcount : 1; for (plane = 0; plane < planes; plane++) { + int remaining = avpkt->size; stride = p->linesize[plane]; dst = p->data[plane]; for (i = 0; i < s->height; i += s->rps) { @@ -1318,10 +1319,11 @@ static int decode_frame(AVCodecContext *avctx, else soff = s->stripoff; - if (soff > avpkt->size || ssize > avpkt->size - soff) { + if (soff > avpkt->size || ssize > avpkt->size - soff || ssize > remaining) { av_log(avctx, AV_LOG_ERROR, "Invalid strip size/offset\n"); return AVERROR_INVALIDDATA; } + remaining -= ssize; if ((ret = tiff_unpack_strip(s, p, dst, stride, avpkt->data + soff, ssize, i, FFMIN(s->rps, s->height - i))) < 0) { if (avctx->err_recognition & AV_EF_EXPLODE)