From patchwork Fri Mar 18 17:46:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34843 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1977208nkb; Fri, 18 Mar 2022 10:46:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+lmGncKxm7mbvkPvbeHQGMrqmghWT/gYeXgCeJIen4rfXL9wkJgtKCCY70sHKTbZOhBW+ X-Received: by 2002:a17:906:30d1:b0:6cf:c116:c9d3 with SMTP id b17-20020a17090630d100b006cfc116c9d3mr9448703ejb.245.1647625607559; Fri, 18 Mar 2022 10:46:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647625607; cv=none; d=google.com; s=arc-20160816; b=SIzfW9EE31p5R0W7x4nGeGv2/LUJB0k1D4cnhxu3S+eYClwhuLUHcOAh6+ry+uk1fO ILiigQmGvTUr7gNPDfcSQksXxPWqR75a1Ep7gcItyfFe3/D0jNx5OTtIZmB/mfx+gzUc gQYNj9Bv0DryyHosa4NH9iXpmbS/YhS1qQAgHiiDAyXkGSNA1dQdF2EvrTuW7HZybnSD Q3HLnNeL4ozCHw/A0GTYbg/RYmdOsmaslkh1u2i1QP7eUm1N3HjD7C5kjyR3R7sBz1oB i3pwrlQNIJro8s5K+YFvhO8TRQvv6l1QgkYZ/aCD5BAcnd7QFF7kMacLkjbeFiuhvtlO P1/w== 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=kSSosahQ1Sycnll5dZp6bSz8Uxbd7Hl6swNhtfwJGNE=; b=0saj+ZaYtdgjFju1DOoWNJsCk/SIp6+ODfJH3Zkfq+ndUZhkkRJC/KcHFYdYSeujhY s34RkM6+HgkYEJoEcN7nU/rtxYLsVGfTNBS9/1hxMVL0FgFMdXV3hF0XUygqNZnANuJq j70GjcjytFJ/KLdLxGWptKIKkG639ZJX+H8u7841h4Jv4nYrHl+/qWzL+4fpmXtDgwT+ sW5v6S/qSRVxcyDnw4iROPrCjtVVhcdXJ8c7D+lzGuJPz9c/SyyVWM+W2+xUDArB8xct o6+GCRFbWDBspS27WlvcBi2jln4qkdFKDEXft5sGuy/Z2K59fQaRvXSzElNeyFx4tsYQ QnjQ== 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 i12-20020a17090639cc00b006df76385e0bsi1608216eje.683.2022.03.18.10.46.47; Fri, 18 Mar 2022 10:46:47 -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 269DC68B13C; Fri, 18 Mar 2022 19:46:44 +0200 (EET) 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 18BA9680545 for ; Fri, 18 Mar 2022 19:46:37 +0200 (EET) 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 1nVGgO-00087q-A2 for ffmpeg-devel@ffmpeg.org; Fri, 18 Mar 2022 18:46:36 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id VGgHn8gdzSgGFVGgOnFYwH; Fri, 18 Mar 2022 18:46:36 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id VGg9nvyYfOPqFVGg9nH6qE; Fri, 18 Mar 2022 18:46:21 +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=6234c57b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=Ljsc6qctoj7kIbeUB_cA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 18 Mar 2022 18:46:21 +0100 Message-Id: <20220318174621.26974-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfFZbfvDHCVPIH0OSYzUC4+xFnCsu5Vr3glEDwRM3X0EjjX2BeWPMCLugdGXK0G4omnGvHmrh6K5ZQC2//eAmpjspU1lemLTOYvRG7gTjDeO1ArJTNKe5 Kpj6P7RxXZ8q6PU7vwB9Ks/A98Ze0c+HIyYqiulAy5ttFg9TXGcaZ3v6wfTCTV4JRduyvT0EgurBrg== Subject: [FFmpeg-devel] [PATCH] 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: 3k9DgNyT1Oqj 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vp9_superframe_split_bsf.c b/libavcodec/vp9_superframe_split_bsf.c index ed0444561a..481484a4f0 100644 --- a/libavcodec/vp9_superframe_split_bsf.c +++ b/libavcodec/vp9_superframe_split_bsf.c @@ -51,7 +51,7 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out) return ret; in = s->buffer_pkt; - marker = in->data[in->size - 1]; + marker = in->size ? in->data[in->size - 1] : 0; if ((marker & 0xe0) == 0xc0) { int length_size = 1 + ((marker >> 3) & 0x3); int nb_frames = 1 + (marker & 0x7);