From patchwork Mon Sep 27 22:37:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30607 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp4602112iob; Mon, 27 Sep 2021 15:43:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhGwZ7MEFDuWeXl4sJ+HqZJDpLxX+YvqK7C6w5Kq/yXhUlFGa5mKhPWMUG3jhTrZh6Hysa X-Received: by 2002:a17:906:7802:: with SMTP id u2mr2940221ejm.325.1632782625557; Mon, 27 Sep 2021 15:43:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632782625; cv=none; d=google.com; s=arc-20160816; b=lvD2OQFA5tMjEthia5Wn+Gg4i1NJKux8OuUjZLUzrEJRhYtFWLub0ShdIukplrZMkB BmN7f06EdKfWfCATz+/e/tElMbtv1tJGbkzbxNcVxOx3NhwepMj/m/Rg6bVWgCRGQVtF Aj4FhWNCZvqeNuFtwkG911Y7TnU1GeUqYRCvXOwP5XF0CdrApJUO0NWXzMR1AKKam+oj quRMRBgM5zNtIdCuIxkRJuBS39935E3HSM9ybUzEPxYFArz6x9SqQd14XIRHcXVxtxU/ nJat72mh1lNZk6ryDQcOLMUPXwPePJ8WxjoX/Uhrl9Z65WnGbHaqIdQYEHjPuhPpEpXt L+cA== 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=RO2wAJ13AOhqfPw/7/PTNmpqZZdvmXwzILtDgY7Bs/s=; b=vDRq+5NOzlKTHAgnlXXo4cUhBRm2GWAwLHdj8+f7rKToQIaiY0FrzsyssQH3sHcptx p5lToNGgHXkqZ1xDztBhkVSqONdOV4tbhAGYwsV5rFdAL7BlW5XMBsHTNFbtYSjeFfDU 09gQvy+CJPpW45iWWDBT7oeBFpimws0TEotPj8bg8tE2WQYCbbEFiSIjTT8hpjH4uB8j 2raeZ2id7nt2WZH1q20l7MD/klh4qEXWyU/GCv6AOk0Vce6cIv9Z4NV5zWmgAuXteiGJ vmS//dh9EqMadjfQzV10Vp2ijkmfhbVuKF0NRXrU0GohyvS0X4ZqQtaaRNaEs1EfdKKG +5Mw== 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 s11si11385673edh.30.2021.09.27.15.43.45; Mon, 27 Sep 2021 15:43:45 -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 7C37E6899EB; Tue, 28 Sep 2021 01:43:42 +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 A43EC68019F for ; Tue, 28 Sep 2021 01:43:35 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mUzGR-00Ai6p-0A for ffmpeg-devel@ffmpeg.org; Tue, 28 Sep 2021 00:38:23 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id UzFTmCQ6wljeHUzFTmtFCU; Tue, 28 Sep 2021 00:37:23 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=rvsHarIZvG2EtXUR7G0A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 28 Sep 2021 00:37:22 +0200 Message-Id: <20210927223722.25098-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210927223722.25098-1-michael@niedermayer.cc> References: <20210927223722.25098-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAc8wxY+lIU9MPpuLL7nvkwsVTvhExQzC9dZ+U8qE90Dkyi8WO3hVWftI2w1f5wa7DtiS7+WsZ8aIx01mCg/lNitF9cvxWHivXlQJPf/Uvg7Wl20m4Vh A0znqnXLalk9GeWN37qZaDLs8U/liY1985MVZzsQWYYAZv+VnN6Lnq6z Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/siren: Check available bits at frame start 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: UvlGgWgYFwac Fixes: Timeout Fixes: 39089/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSNSIREN_fuzzer-6677219854909440 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/siren.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 7f2b4678608..708990d6654 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -718,6 +718,9 @@ static int siren_decode(AVCodecContext *avctx, void *data, if ((ret = init_get_bits8(gb, avpkt->data, avpkt->size)) < 0) return ret; + if (s->sample_rate_bits + 4 > get_bits_left(gb)) + return AVERROR_INVALIDDATA; + skip_bits(gb, s->sample_rate_bits); decode_envelope(s, gb, s->number_of_regions,