From patchwork Wed Nov 9 22:56:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1368 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp548956vsb; Wed, 9 Nov 2016 14:56:47 -0800 (PST) X-Received: by 10.194.95.65 with SMTP id di1mr1710575wjb.184.1478732207667; Wed, 09 Nov 2016 14:56:47 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w133si2631726wma.138.2016.11.09.14.56.47; Wed, 09 Nov 2016 14:56:47 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@googlemail.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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81C87689E34; Thu, 10 Nov 2016 00:56:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D961689C57 for ; Thu, 10 Nov 2016 00:56:34 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id g23so890993wme.1 for ; Wed, 09 Nov 2016 14:56:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=Kl7iw3TdmuwVQSEFSM7njAFyPqp8ab/LlY0kAmESU3s=; b=pIysInDsTABl0ziJxnc/husHrV/vVp4EVn0NlCv/Hki9hawMG1buUspL4NJGAhZO35 ynzSNuL887H/i8zG9FCZh47JHCe6l4B5tZTs1dZaRNkfAZaHkOitOt8cwgMRr9hZFCcG /9ci/n9c51/aX1zicX/ReWQppGgf8AkoTbjNdEzSQLgEl+9ICDKuvD0JB4IeOyFW1XeD fURTDIP5p3KC2o3dpX/tQ53cPB1xPEvOipow5fvx7l+3lmA2ht6lF8hMAisbSyws0YZB sx9+hFglklR1Ox6O33I4bwcjCaN1UiUG4SCtQTXQMMdp0323S4To8OJADh91dz26rmjD o+Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=Kl7iw3TdmuwVQSEFSM7njAFyPqp8ab/LlY0kAmESU3s=; b=SisFnz22K7N4PhQVaQNGZ/cyMhF56MloDdz3TP9haR9p3pVTnuotbKFBBSxev7rFtF tYlHDJEsDOELknQP8fglIIS0PCG0hU9SRevAsNyvYKv5FJtkTJmTBUe95tsPQno1dUGU ccAdm98F3gXup7Y8PIklaes8jAupW2aXg8Dw0rGC+zjNZATldWEvRqNsDpo0yMHs4shR hr1sMylxxC6l23cvqYjKIzIpLPLC1SA1z4kjW/d/c7lk/es9TTb9VObcEg9UUkpnJCJG jpez8qvuj1jXWkQ9y1BYmXiNVTXnbikMfLxzo6fUlo0TlCNR/0IQSeB97CVzDViFQ1uy hU5w== X-Gm-Message-State: ABUngvczT1LH30R+LcTiHUK50LuassmYZk5NO8ijkB3JWkHKJX7E4mKHAXazASeEb/Y40A== X-Received: by 10.28.35.205 with SMTP id j196mr2825648wmj.62.1478732197355; Wed, 09 Nov 2016 14:56:37 -0800 (PST) Received: from [192.168.2.21] (p5B072193.dip0.t-ipconnect.de. [91.7.33.147]) by smtp.googlemail.com with ESMTPSA id gk6sm2056924wjc.21.2016.11.09.14.56.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Nov 2016 14:56:36 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Wed, 9 Nov 2016 23:56:36 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] proresdec_lgpl: explicitly check coff[3] against slice_data_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" The implicit checks via v_data_size and a_data_size don't work in the case '(hdr_size > 7) && !ctx->alpha_info'. This fixes segmentation faults due to invalid reads. This problem was introduced in commit 547c2f002a87f4412a83c23b0d60364be5e7ce58. Signed-off-by: Andreas Cadhalpun --- libavcodec/proresdec_lgpl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/proresdec_lgpl.c b/libavcodec/proresdec_lgpl.c index 467a423..bc5bdb5 100644 --- a/libavcodec/proresdec_lgpl.c +++ b/libavcodec/proresdec_lgpl.c @@ -625,7 +625,7 @@ static int decode_slice(AVCodecContext *avctx, void *tdata) /* if V or alpha component size is negative that means that previous component sizes are too large */ - if (v_data_size < 0 || a_data_size < 0 || hdr_size < 6) { + if (v_data_size < 0 || a_data_size < 0 || hdr_size < 6 || coff[3] > slice_data_size) { av_log(avctx, AV_LOG_ERROR, "invalid data size\n"); return AVERROR_INVALIDDATA; }