From patchwork Wed Nov 1 19:02:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 5819 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1128403jah; Wed, 1 Nov 2017 12:03:11 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TdTBX0yZqqMPs0BHZV3tlVIVCKYZCiDlmaDEq8hfzV/JI5MBFvkUGKvkIGw7lrOegwo2PM X-Received: by 10.28.172.65 with SMTP id v62mr925202wme.45.1509562991253; Wed, 01 Nov 2017 12:03:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509562991; cv=none; d=google.com; s=arc-20160816; b=GhwhsLGCA/jZ3Uc+20tO1sE12QJbKLQfAY+nOMgu+QyK0mIDnz2Z+dCVuCPAluqARF vcb6TF5RK/Dq3QI0i6FmaoCYMXst5JMScycyhkXwrFqIGtyb4AygjgvcwOvzr1l95/vb JFtAHXE/6ScZNXr/haBgocI3c82JQNh5+KAmTJmkMkXCaNnaKGh/Ncna51T4rxjE4VLS 0vdngq1WK6iubb13GZ9Fa6DSC0whrJDaMId7dZ44E2/RGMcgFtY3mSf7R7aCfhOo5Wvn AGzUiUHFghgN6u92hzkZDhnEgcMmhnhM3imf3cpJ3EMHu6DqjAqJSS1dXGpjv5Pdy26X YrVw== 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=n+hypSvorVCiB/SEim5z7JkKNP6Qf3mypaUdYXRAXZ4=; b=Q5Ngsxykov9SAsZ/1fWpmnDBhWXVX8BkaxbLDnpAkn9ulSOGP+u8wLH6aiyDKlJ8wm 0lo55OjXj+3fUb4j1wL51bgoqCDLT8950Q6iZDzh3BCcIuipaqNe0BXVCHrYvdijD/q6 zRZKu1DBNb2DjYQnb5uq4nXLZxzq3T9kITRH6r4OQdynDmmhzcRLffKVghCAhTqqSGEk vq0KpkCl09+uQLug34LtPDK583wlFd0TBE3CoYy4eiztDmqO94h9pMe0/h/q2ymJ/Qk0 uo77ZLBeCDc8XJ4bhJbXkE67XwNZpGOD5NErW/Ob1uukeT/tUzakQ+3ZPFAIi4nSuZw1 TBwA== 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 g206si1248942wmg.269.2017.11.01.12.03.10; Wed, 01 Nov 2017 12:03:11 -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 46E7F680B92; Wed, 1 Nov 2017 21:02:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-2.mx.upcmail.net (vie01a-dmta-pe07-2.mx.upcmail.net [84.116.36.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E0E968A139 for ; Wed, 1 Nov 2017 21:02:52 +0200 (EET) 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 1e9yI2-0004xX-5X for ffmpeg-devel@ffmpeg.org; Wed, 01 Nov 2017 20:03:02 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Uj2z1w01o0S5wYM01j30zP; Wed, 01 Nov 2017 20:03:01 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 1 Nov 2017 20:02:59 +0100 Message-Id: <20171101190259.31977-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avcodec/gdv: Check compression before allocating frame 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: 2926/clusterfuzz-testcase-4987110014582784 This reduces decoding time from 7 to 4 seconds The timeout should have been fixed in 0561bd2fc2bff0dbe651d5998e9f129c43d25eb3 but ossfuzz did not close this issue Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/gdv.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c index dc91869edf..e52a637610 100644 --- a/libavcodec/gdv.c +++ b/libavcodec/gdv.c @@ -409,17 +409,20 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data, unsigned flags; uint8_t *dst; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) - return ret; - if (pal && pal_size == AVPALETTE_SIZE) - memcpy(gdv->pal, pal, AVPALETTE_SIZE); - bytestream2_init(gb, avpkt->data, avpkt->size); bytestream2_init_writer(pb, gdv->frame, gdv->frame_size); flags = bytestream2_get_le32(gb); compression = flags & 0xF; + if (compression == 4 || compression == 7 || compression > 8) + return AVERROR_INVALIDDATA; + + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + if (pal && pal_size == AVPALETTE_SIZE) + memcpy(gdv->pal, pal, AVPALETTE_SIZE); + rescale(gdv, gdv->frame, avctx->width, avctx->height, !!(flags & 0x10), !!(flags & 0x20)); @@ -451,7 +454,7 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data, ret = decompress_68(avctx, flags >> 8, 1); break; default: - return AVERROR_INVALIDDATA; + av_assert0(0); } memcpy(frame->data[1], gdv->pal, AVPALETTE_SIZE);