From patchwork Fri Jun 10 23:10:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36151 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp64193pzj; Fri, 10 Jun 2022 16:12:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxzPUBNmpmAescWX6P+bVv84d8WKkBqgRTh8p/KzOMuHvOnKzpt+7rlfD/riI7fZQHBzA4 X-Received: by 2002:a05:6402:6cc:b0:42d:bd2d:9f82 with SMTP id n12-20020a05640206cc00b0042dbd2d9f82mr54050288edy.59.1654902724199; Fri, 10 Jun 2022 16:12:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654902724; cv=none; d=google.com; s=arc-20160816; b=B/bUOH1Uh2vXuNsskzagKEC065nl6wLaaaPH7Avp+gIlqYata3uUPhHEGBp5l3TcTV 2zkjhda3sySr2UBPp16ZfodbdGr4U/wyUpi9iZVJeWGfNWNH7Cft4vgOrp96BLzxPVVN qkukUs+SYHsyLUeSK1UdwHQAoh/ITupppXy5w5F4EB2oLX+Sup1ndq4Kd1ykd5czNXzv 7aAxoLBqgAYKheEzfEhaAq9zpqXJ2DheXZlH91C6ybhs2vNeF/uytJ3V17K1EsF/9xqy Y3u9zKbaSNC6dr2/6d7TvxtVHqVBjS5N7tNb561dy0iWAxI2LeUAuVPRIPpfH4/Ry7OE 5rvw== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=n/NCzvRvI1emRJ/7bmbIoGyDvmkLKazBrVzIaWxAvkM=; b=0Xix0pwg0HI+UlyEpoa1dEi9YFNcWRV18HUwfnc3PlisKymnzHpomGtNZ9MLQJhTFs CtTOqu524g+u2/bvXVtcFTv1Ai5BTvma0h4FVb84mqiGathvZisbGnO5JP8SCtOrJGqI /Uacwl44QCHR8dxF4qMQRl49liqkyrL/ZdVvO6eEbQp1xgnR+b2QpW7s+6BbdQqqcc1R R0ugH1mTqkHzimImXuXHbMXKKoDdr0H5jpTu859QUA2SnL/vBddcu3FssK8IOSfdCyiF xlPYTB8AAGBHAaMKdl5HGp/4tz94Cjd5dhCq8X8Bh1vNrpsoKmw9hDFVSVVood8rw6ru WOFg== 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 sc31-20020a1709078a1f00b0071211577419si329731ejc.1008.2022.06.10.16.12.03; Fri, 10 Jun 2022 16:12:04 -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 A1EB368B57F; Sat, 11 Jun 2022 02:11:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04E9E68B553 for ; Sat, 11 Jun 2022 02:11:53 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nznn8-000AHG-28 for ffmpeg-devel@ffmpeg.org; Sat, 11 Jun 2022 01:11:46 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id znn8nmlkb8s8Uznn8nHoBk; Sat, 11 Jun 2022 01:11:46 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id znmAnaTLhOPqFznmAngAGm; Sat, 11 Jun 2022 01:10:46 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=62a3cf76 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=KWJ_TmOUTs0HLNuw0F0A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 11 Jun 2022 01:10:45 +0200 Message-Id: <20220610231045.9760-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220610231045.9760-1-michael@niedermayer.cc> References: <20220610231045.9760-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfG4E/WE6iSj27a+tDQ78mudvzkHJs8NLLLBaPfDz7u1v02ILOOc8B1FIhl8DBKO/bx9GBT30wdy44xhpD7dZMplfuZ61aSUFo/WfaKtnFkqk/bkWIfwd VbQf8SAhrhjDEeEtj7flLNNXagQpkI0IYOdQym81p/YSCKFF+DgiFeXbkYK0ayzilzk9XNo6LSsqPw== Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/fmvc: Require key frames to fill a non trivial part of the buffer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: ks0LFGhgOP3a Keyframes filling only part of the buffer should theoretically be invalid as they are not really keyframes. Fixes: Timeout Fixes: 47879/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FMVC_fuzzer-6258764937822208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/fmvc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavcodec/fmvc.c b/libavcodec/fmvc.c index de2bf828f4..36990956e0 100644 --- a/libavcodec/fmvc.c +++ b/libavcodec/fmvc.c @@ -284,7 +284,7 @@ static int decode_type2(GetByteContext *gb, PutByteContext *pb) } } - return 0; + return bytestream2_get_bytes_left_p(pb); } static int decode_type1(GetByteContext *gb, PutByteContext *pb) @@ -391,7 +391,7 @@ static int decode_type1(GetByteContext *gb, PutByteContext *pb) } while (len && bytestream2_get_bytes_left(&gbc) > 0); } - return 0; + return bytestream2_get_bytes_left_p(pb); } static int decode_frame(AVCodecContext *avctx, AVFrame *frame, @@ -414,6 +414,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, if (key_frame) { const uint8_t *src; unsigned type, size; + int left; uint8_t *dst; type = bytestream2_get_le16(gb); @@ -423,14 +424,17 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, bytestream2_init_writer(pb, s->buffer, s->buffer_size); if (type == 1) { - decode_type1(gb, pb); + left = decode_type1(gb, pb); } else if (type == 2){ - decode_type2(gb, pb); + left = decode_type2(gb, pb); } else { avpriv_report_missing_feature(avctx, "Compression type %d", type); return AVERROR_PATCHWELCOME; } + if (left > s->buffer_size*4/5) + return AVERROR_INVALIDDATA; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret;