From patchwork Sun Oct 14 13:43:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 10671 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D9EA2446E1F for ; Sun, 14 Oct 2018 16:48:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A80668A1AC; Sun, 14 Oct 2018 16:48:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABB57689F35 for ; Sun, 14 Oct 2018 16:47:55 +0300 (EEST) Received: from [172.31.218.53] (helo=vie01a-dmta-pe08-2.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1gBgkl-0001dI-Ba for ffmpeg-devel@ffmpeg.org; Sun, 14 Oct 2018 15:48:19 +0200 Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1gBgkf-00058j-0U for ffmpeg-devel@ffmpeg.org; Sun, 14 Oct 2018 15:48:13 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Bgjggl5JBkosQBgjhg2QDU; Sun, 14 Oct 2018 15:47:13 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=NNQEBHyg c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=pGLkceISAAAA:8 a=zrVEk8pEt4V5znbuxWQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 14 Oct 2018 15:43:56 +0200 Message-Id: <20181014134356.31500-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGMkAU8HnQYs+QpevkbLurDoARfls+e3XZSuszNcBFPxAod0EmGFqftFxbChY7knxmD5fQ70GyjW9JuSkBKreYTepkMylFb4YGhy3StOwUe1RqVsgMpk tVOPQFaiflmN8YK3YCkMezf4Sf4HYXzavORC+4QNdMWWr0o8tBteB5ea Subject: [FFmpeg-devel] [PATCH] avcodec/av1_parse: Check obu_size 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: out of array read Fixes: SIGSEGV_get_obu_bit_length_av1_parse Found-by: keval shah Signed-off-by: Michael Niedermayer --- libavcodec/av1_parse.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h index 276af33ba9..312d8825e1 100644 --- a/libavcodec/av1_parse.h +++ b/libavcodec/av1_parse.h @@ -130,6 +130,9 @@ static inline int parse_obu_header(const uint8_t *buf, int buf_size, if (get_bits_left(&gb) < 0) return AVERROR_INVALIDDATA; + if (*obu_size > (uint64_t)buf_size - get_bits_count(&gb) / 8) + return AVERROR_INVALIDDATA; + *start_pos = get_bits_count(&gb) / 8; size = *obu_size + *start_pos;