From patchwork Mon Mar 21 20:19:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34879 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1960090nkc; Mon, 21 Mar 2022 13:20:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzT8ULHnXHWkGT033cILMdRLw/mK36jsdT2biSL0ZWGN9as8IhZVqWZ4bQBzV6YFLG8frac X-Received: by 2002:a17:907:c05:b0:6db:f118:8834 with SMTP id ga5-20020a1709070c0500b006dbf1188834mr23006951ejc.536.1647894014032; Mon, 21 Mar 2022 13:20:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647894014; cv=none; d=google.com; s=arc-20160816; b=D7GExWgSumt2/fN1pKGn4/zBWkD1V8wbMgaZIFFo84D9VnF4xFlKugcrEOgFXbqpHU BvUXMvnByC0mQEWfMr/+GxNyCc87kmwwsUhPGKL0HZLdw+NBzpAGFEMyAEyx63/YrqHb VDCFJXn6T9CtVVhXhe66pYahUi1hV8e6IxdzbeX2eWi3OMxTwiGHHTTMCKw5emNyOWsY 6xoNgZVLAeXe3FH1Jt2ZIEGj+GN1NZrPSgwRasdyW3VJ90uRI5kcogrzV3juhlf2KRN7 QoKNF/qssajmxm1C7odPQ0Iq0yyvVGoRR/PE+mkt2vPCU1eeU8ZlTH9a80V8f2t2aAT8 D6mA== 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=epM7j4JsJMhkVqQ4zBOfMMqbJOcZDEt91skNQ1owmgQ=; b=iAkIN8VhoOrnuFSlmiArGQC+HZ0acDJ46LhYde6M4sU7qOC3GLcbsvW4ucwchAU+H9 xaUawgZCBz8M8cSA+CWFtywSA7ltVS6p8SKtBZJHyyZULfAg19k4WEIQYrbSpUVeGTNH 54AirXkdbepE+zoAxxEottz5SoXCE9ll0GKLfJhJPxA9UpneWRwXjqQMTo4zF3PBAXBZ d7uP5kgvXQwkTzQyVnnN/KpGZHaWx0/+4/IPThUhxjb5mO9ABU8f6PjgWrCwXllaty/P jMLxj6wCo8KWAW+YFgrSQMkIJpM3tku1nILOORYF/Pl4r2o4PToZ+Gl3Cj631cnn5jfH CLxQ== 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 j9-20020a508a89000000b00418c2b5bdadsi10786974edj.143.2022.03.21.13.20.13; Mon, 21 Mar 2022 13:20:14 -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 35ED468B03F; Mon, 21 Mar 2022 22:20:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFD4B689A52 for ; Mon, 21 Mar 2022 22:20:02 +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 1nWOVW-0002v1-8a for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 21:20:02 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id WOQgncbCqSgGFWOVWnNAT6; Mon, 21 Mar 2022 21:20:02 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id WOVHnj3R98eSWWOVHnxfxb; Mon, 21 Mar 2022 21:19:47 +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=KKE5sHJo c=1 sm=1 tr=0 ts=6238ddf1 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=6QRxg8biEYerliJsndkA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 21:19:42 +0100 Message-Id: <20220321201946.16919-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfH1hqgsrl+FWtizKGaV0K6EiGgr3pNmOG3fN0qHQq5uM3t+WDLHi1NaJIh3YRMO/gZ08zcXxdd+M9odhsO7UXHTG7OJUy/g45vkYjqpGKWVSQpJiUbts G3sMxKu0hv7gmCkviU3fVUJ4YDX/PlKQUSvRy9rsYuTxMw5prb4is/EcAhZHGAhrIkpoj3vBH9FZfQ== Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/vp9_superframe_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: 74L5vAgj4tGk Fixes: Out of array read Fixes: 45722/clusterfuzz-testcase-minimized-ffmpeg_BSF_VP9_SUPERFRAME_fuzzer-5173378975137792 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vp9_superframe_bsf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vp9_superframe_bsf.c b/libavcodec/vp9_superframe_bsf.c index 57681e29e4..bed9fd4ba2 100644 --- a/libavcodec/vp9_superframe_bsf.c +++ b/libavcodec/vp9_superframe_bsf.c @@ -108,7 +108,7 @@ static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *pkt) if (res < 0) return res; - marker = pkt->data[pkt->size - 1]; + marker = pkt->size ? pkt->data[pkt->size - 1] : 0; if ((marker & 0xe0) == 0xc0) { int nbytes = 1 + ((marker >> 3) & 0x3); int n_frames = 1 + (marker & 0x7), idx_sz = 2 + n_frames * nbytes;