From patchwork Tue Apr 17 00:13:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8466 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.85 with SMTP id c82csp1374822jad; Mon, 16 Apr 2018 17:14:56 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/0jdwpOkVW8MOgu12HEv+In2teB+/gaAqHR1aXpuVgadmwwnv3DT9cmRbJbP0eUu8FRW11 X-Received: by 10.223.188.19 with SMTP id s19mr11304789wrg.213.1523924096210; Mon, 16 Apr 2018 17:14:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523924096; cv=none; d=google.com; s=arc-20160816; b=EGh+DwsTuAgbslMvqvi6zNJFe1jdeUw6wrPvay4+57B+gO6MxqwTZDcKR6+4iE3Ac8 LpGBKjmVQ/BR4hYRtmc495rJ7CCtGzo2DFNW2MTnGfMgSUxr1IBKvUbH6sXr9dfvqETw HJaFp1XgHXnOCmPyb6kNk3xuqy4vCmsUBZBgDPvxvduA6Oth0Zh9/Eoh9xlKA6bUOLc/ Opck3E/wur5Kaq5/XiiZFELpNyMF5bcBWNpF55Xxm3mToJsG30SEaVsqwbYIZzQpGUGT 99WuxDCkUAnxlYYOPdtWNP/BiSlvvz1YZzU+fsGra0JwK40Q8nPPmDSfahN5fAPiCyop mDRQ== 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=p6ka9sP1Cy6Nl1gG9xhLrYmwuWQFVecFTRQoSAg4DT0=; b=L97RMCa2yW4FWeXbDJoZGZ3vyx7NEbKY/pgAfG57o68hQhftl4zpVPUBTtANa0yD63 TiB2SSyFYlOapzYJQqmTRFFc7ikt2YJy6s6vci5XRYRuUn2bEAF7XDHNAubf7OaYBSy3 uKCaqo8dkGYw+B61v8/zrPD6dTxh8KArG+W44+KuVQ+sG+VzB2hMMwJoe4xS2+HTotGw 7/sNxrPFbd6GjdAZU3pNkplKDKj4qxs9WRbcLaBWYvx8g24vD7ms/ikzr8Rqe3MytxAK 6WoGpJincvu+ArcSANxEoUKlhUmitUQJmDSVzBBWgF71VoWWivIhzZEdMFw5Y1OgKESf PD6A== 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 k32si9904725wrf.11.2018.04.16.17.14.55; Mon, 16 Apr 2018 17:14:56 -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 0B9E4689CB9; Tue, 17 Apr 2018 03:14:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-1.mx.upcmail.net (vie01a-dmta-pe07-1.mx.upcmail.net [84.116.36.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CE92680C92 for ; Tue, 17 Apr 2018 03:14:20 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1f8EGk-0002ij-2B for ffmpeg-devel@ffmpeg.org; Tue, 17 Apr 2018 02:14:46 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id bCEg1x00n0S5wYM01CEhMM; Tue, 17 Apr 2018 02:14:41 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 17 Apr 2018 02:13:42 +0200 Message-Id: <20180417001346.8174-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/cinepak: move some checks prior to frame allocation 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" Speeds up decoding from 8 to 3 seconds for 6302/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CINEPAK_fuzzer-5626371985375232 Fixes: Timeout Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cinepak.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 89e940ae0d..ba0589582f 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -315,14 +315,11 @@ static int cinepak_decode_strip (CinepakContext *s, return AVERROR_INVALIDDATA; } -static int cinepak_decode (CinepakContext *s) +static int cinepak_predecode_check (CinepakContext *s) { - const uint8_t *eod = (s->data + s->size); - int i, result, strip_size, frame_flags, num_strips; - int y0 = 0; + int num_strips; int encoded_buf_size; - frame_flags = s->data[0]; num_strips = AV_RB16 (&s->data[8]); encoded_buf_size = AV_RB24(&s->data[1]); @@ -353,6 +350,21 @@ static int cinepak_decode (CinepakContext *s) s->sega_film_skip_bytes = 0; } + if (s->size < 10 + s->sega_film_skip_bytes + num_strips * 12) + return AVERROR_INVALIDDATA; + + return 0; +} + +static int cinepak_decode (CinepakContext *s) +{ + const uint8_t *eod = (s->data + s->size); + int i, result, strip_size, frame_flags, num_strips; + int y0 = 0; + + frame_flags = s->data[0]; + num_strips = AV_RB16 (&s->data[8]); + s->data += 10 + s->sega_film_skip_bytes; num_strips = FFMIN(num_strips, MAX_STRIPS); @@ -439,6 +451,11 @@ static int cinepak_decode_frame(AVCodecContext *avctx, if (s->size < 10) return AVERROR_INVALIDDATA; + if ((ret = cinepak_predecode_check(s)) < 0) { + av_log(avctx, AV_LOG_ERROR, "cinepak_predecode_check failed\n"); + return ret; + } + if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) return ret;