From patchwork Sat Mar 12 23:52:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34720 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp991336nkb; Sat, 12 Mar 2022 15:54:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJyGYWBor/OK2vXvvmPJC07lWwTdwbERou7oEImpbBsWVQnT6pEWT8rfJPEjb2KO6PcRcIHi X-Received: by 2002:a17:906:a1a:b0:6cf:d2d9:410c with SMTP id w26-20020a1709060a1a00b006cfd2d9410cmr14056053ejf.713.1647129299819; Sat, 12 Mar 2022 15:54:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647129299; cv=none; d=google.com; s=arc-20160816; b=WIdbYaZ8rgC9am7zCmOcmrpX8Lu9tX+phQ/X6VrKcn/t0PxJlp0JczvNre7iDZEIV5 fbPamgQ+tGSjY/3NOsxM6kot6AszY1nURRTbYbvj9oxZQhHSyR+90UyhawOyFGvp+0oQ p56GTO6p/Tf9ZEbdK7Txk2j5RvUl/dXbOOSnf3mFLSnUaQAWeBrv/XhAXYjn4ZENzFGd VqUOOVJ/BRHSm8b9xYp1259tbVdGWnFOvX2LWmm/zlAZdhUon1gOEJaG5+kJOIdp++fV VCdehe98IceqZ7xLZPQz+UxMBNIJfZn2RH+JbvMotnp98jYzJdKYfofWDvvCnwvgj59i H+Cg== 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; bh=uhQGwXbLhGZR0J9S6oGsyy7B2h1ilzdanloWZSjodFQ=; b=dETTzzFhucLLUiFNke+jilZ9q+DHRgLRlmF5PdlfBo6+5t9DOa+8Txgy1Uv8pkknAU 7pXVhf7EnLcRMBacCEjs5jiKqkv8+8Y4D5+71Dlhxn4ran+ACV3C76o8LsJBbUfufgG6 FEgB3MqXem1iKY/hISGsuGexhfxeAj14g/lY2vs0bpN4TDynfuxS9lGaY1VLXpmerLRt a85deBjfPgdY+VY+DE5OlTWzUoVz2XXooAV7OSfDmqXbh9SLwsQakct2tFv5tGrc7/DN Se6Wk5OJLgWmjfSy9F1VpV1iE3HQGrhNJf1xW8j4F5Io0g8OpoxIYcCVMFyXQqy+9C8l 72oQ== 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 f21-20020a05640214d500b004162353adf5si7132498edx.152.2022.03.12.15.54.59; Sat, 12 Mar 2022 15:54:59 -0800 (PST) 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 1A56F68B1BB; Sun, 13 Mar 2022 01:54:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E04868807F for ; Sun, 13 Mar 2022 01:54:43 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nTBZL-005jbN-0J for ffmpeg-devel@ffmpeg.org; Sun, 13 Mar 2022 00:54:43 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id TBYNnKmMaSgGFTBYNn2xd8; Sun, 13 Mar 2022 00:53:43 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id TBX9nu2mUOPqFTBX9nBuww; Sun, 13 Mar 2022 00:52:27 +0100 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=622d324a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=sjAuraTEZ6yCOswiwBcA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 13 Mar 2022 00:52:24 +0100 Message-Id: <20220312235227.19626-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfClUmHkzJA0O4bO65lRWcde1T6QZCHWLMvNu8x+cve2FR9D0Ls5vnFecRENuFcwqZHYuVdy3gSL1wqxh8h2kg8FDBNQhm6VlL3blwz4kfVeNDV7Ih/zq rUJrYjtfu1pY7tr50M0O256I5ZgACSn1gkgm/t+auJ52uQkw2B3Q8pc+lpDj8UmpyASZUg6OWiGqnA== Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/vp9_superframe_split_bsf: Check in size 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: AvBi+59CbbAj Fixes: Out of array read Fixes: 45137/clusterfuzz-testcase-minimized-ffmpeg_BSF_VP9_SUPERFRAME_SPLIT_fuzzer-4984270639202304 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vp9_superframe_split_bsf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vp9_superframe_split_bsf.c b/libavcodec/vp9_superframe_split_bsf.c index ed0444561a..6af555c078 100644 --- a/libavcodec/vp9_superframe_split_bsf.c +++ b/libavcodec/vp9_superframe_split_bsf.c @@ -51,6 +51,11 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out) return ret; in = s->buffer_pkt; + if (in->size == 0) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + marker = in->data[in->size - 1]; if ((marker & 0xe0) == 0xc0) { int length_size = 1 + ((marker >> 3) & 0x3);