From patchwork Thu Oct 21 12:00:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31198 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp515239ioa; Thu, 21 Oct 2021 05:01:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEyGrjXrLt7TGLaI9ywpEkFUntsHVRAVoLRqS2Kkhfbyajsl7vx++taJry9StmcC3dCGf0 X-Received: by 2002:a17:907:7d8b:: with SMTP id oz11mr6958593ejc.84.1634817673775; Thu, 21 Oct 2021 05:01:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634817673; cv=none; d=google.com; s=arc-20160816; b=fpKNhQpAE1LvN2OLVdxuNDKeNSpSL3Z+YS+8WOBU64YV23tlAQENkZNXHgmdVm/27X AcUsFYyFPRVYA13TQiCNK/4a2niqvYAL/p5eIzzRcerGPAerHWPzBS85GPKQyK8NoSnU eZ8rusd+DGSxKQCCim17/cxU8SWoKMJw5eU0DEvGtVJ0qgfNBIt2NOn+vPHWDHkT9BDp xMlP5qXoEheEuZFWuPSrvh01OWOQsI6g2LfQqUqlMizX8uhxDkEglPOlWeOUqtd1+GvQ k0ok/xB+kBaKQDEuU0wPEndgpWWkBGZ4XLYp+HgzgI4WNCMP2z+PvJ+HEu5+BxR2csnz sXmA== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=EdvJ0zBRFFHeb0pIUUuia4qsFzQrHG5opIjQGkoiYTo=; b=VchAnMVPmFOrFY9M45A8jOlaXPcZKgrMWK+OUGDf6UOM8NMfOKJ3H1NxwaiB6jR0Bh arZViMANSNN08nHKCec7eFkybm2aeFcyhyxt7LtIYvR9GkMuT5z3lZKuGkkamePrBQw0 ZDJwwrrEHuM+jz73UllCgscPB3NOhdkgdlsI72WBNuEZAgjiWtFzkouIvi2rqjx+JRUf nRP42dcjGkr9BqyF7PmyhzKfsC1c4XQJHbjl4opuGejX1A41Y8Ii7tRWj1L090YgwH7G VQwjr8lLha7kEswDmGxnV0OdN5tpiC1oAtDlUGGcybTYkJIKIViAZEYIabIvGQU0GokP wPMA== 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 du13si8430048ejc.346.2021.10.21.05.01.12; Thu, 21 Oct 2021 05:01:13 -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 B3A9668A8DB; Thu, 21 Oct 2021 15:01:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-1.mx.upcmail.net (vie01a-dmta-pe04-1.mx.upcmail.net [62.179.121.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0850A689F02 for ; Thu, 21 Oct 2021 15:01:02 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mdWkn-000rw1-07 for ffmpeg-devel@ffmpeg.org; Thu, 21 Oct 2021 14:01:01 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id dWjpmU964SgGFdWjpm3830; Thu, 21 Oct 2021 14:00:01 +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=f8Q2+96M 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=pGLkceISAAAA:8 a=7lV8Xy_oYM9mYZSBux0A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 21 Oct 2021 14:00:01 +0200 Message-Id: <20211021120001.14095-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfHuYZmA6BHFUu4mXpJPCUM+oh6VE4nCyfFDWaMPhKTILEafJQobBRiaVdp9yK10TkSC/TkK0nH2VOUG97h5tbGq410pQInhwfbVDIHe+fIrrEh3sdIeu P7Iu6GU3QxsuMp13/fBxWDmg14BrcTXx2qFFUqou97rw2R+vEzlUmtq+CwaaCWRyvwg2uLTuKaMiQShKOVfhtHaZ+xKSYt62vcY= Subject: [FFmpeg-devel] [PATCH] avcodec/flac_parser: Consider AV_INPUT_BUFFER_PADDING_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 Cc: Mattias Wadman MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6icDPl8EuLip Fixes: out if array read Fixes: 40109/clusterfuzz-testcase-minimized-ffmpeg_dem_FLAC_fuzzer-4805686811295744 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg CC: Mattias Wadman Signed-off-by: Michael Niedermayer --- libavcodec/flac_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index 2c550507fc8..61232eed829 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -196,7 +196,7 @@ static int find_headers_search_validate(FLACParseContext *fpc, int offset) uint8_t *header_buf; int size = 0; header_buf = flac_fifo_read_wrap(fpc, offset, - MAX_FRAME_HEADER_SIZE, + MAX_FRAME_HEADER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE, &fpc->wrap_buf, &fpc->wrap_buf_allocated_size); if (frame_header_is_valid(fpc->avctx, header_buf, &fi)) {