From patchwork Sun Aug 5 01:16:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9892 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1743592jad; Sat, 4 Aug 2018 18:17:32 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd4s0fDlXEhkl/K94n/giF20/rcV3Q2jx0ZcPTKUsse39Ojbo/tLPYG4wCLU9WLmUupeDf8 X-Received: by 2002:adf:a4d4:: with SMTP id h20-v6mr6081976wrb.167.1533431851956; Sat, 04 Aug 2018 18:17:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533431851; cv=none; d=google.com; s=arc-20160816; b=YScA/YxjWwNLFJcovXNkIUj6kh8oof1gxizX4MNdsHguy8P+QVKlBKlLjZKOV+yUJt /32mYyuhlOS+X3s5FVL4olL3yVS/IEZdb/iOvFTuBxq1H4OrcMqns2s9zlaG6yh2//+9 leMzOWL6zZ91VDIiXvXQGZcNLMOJj64HVyrbNB6Vkru5dAdyFwoLyLlgTEvEUn7gkdya a8gQfy4MFmKE47mordMBJ35hjv2kjJtPushYZTy53JbMKDdv5+uBT99oNj07SDkn+eAm pHHU7GEVx4Xy3UlV+IW+3yCOpRAX2QfP7KaLYa5xxJo23KeMbVmKy021tIJZkiM7PG5g N5Ew== 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 :arc-authentication-results; bh=H6AsUeg90jSI9x6GLFsQGozM2E+Aw/s6uOZOjzY8Zs0=; b=tgMgVDL3/a4ICLdeKm+HIJ0eSjnRIVF4ICZ6iC30LG1lSPt8G9WBgiVuuJk67jVa64 jsKRYNBl5HqhzzDCRYrz/b1R/Lq3hBQNBsSR6Fcwx2dQTHb/mhk+b3EK3yYJDa77/WJb vTSaNGFVPApNjIQ8yMaYGhj1Pl8eEMiwPDXRJF2vbZ3TZr6ME0w82VCspytt5mpa2Isi lEsoLHBJFLMkd322xvehVdzo+7xzFN1N8fcMlQuCBeqjeORHrVjbhUKZdd4y7CQmwtRY 8M4rUMTGyZeGeSy7e31oOwYRL844q+4/RDI0DcsdquQngzakfE9due5ZrOZE6Rra8jBi ng5w== 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 p3-v6si2465798wmp.134.2018.08.04.18.17.31; Sat, 04 Aug 2018 18:17:31 -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 A1E2F689975; Sun, 5 Aug 2018 04:17:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F239B680AB5 for ; Sun, 5 Aug 2018 04:17:03 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fm7fe-00080r-RG for ffmpeg-devel@ffmpeg.org; Sun, 05 Aug 2018 03:17:22 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id KDHE1y00R0S5wYM01DHFkj; Sun, 05 Aug 2018 03:17:15 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Aug 2018 03:16:41 +0200 Message-Id: <20180805011642.5290-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/vp9: Check in decode_tiles() if there is data remaining X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Fixes: Timeout Fixes: 9330/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP9_fuzzer-5707345857347584 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vp9.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index b1178c9c0c..4ca51ec108 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1302,6 +1302,9 @@ static int decode_tiles(AVCodecContext *avctx, memset(lflvl_ptr->mask, 0, sizeof(lflvl_ptr->mask)); } + if (td->c->end <= td->c->buffer && td->c->bits >= 0) { + return AVERROR_INVALIDDATA; + } if (s->pass == 2) { decode_sb_mem(td, row, col, lflvl_ptr, yoff2, uvoff2, BL_64X64);