From patchwork Thu Jan 26 01:13:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 2319 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2471421vsb; Wed, 25 Jan 2017 17:13:26 -0800 (PST) X-Received: by 10.28.139.141 with SMTP id n135mr23527460wmd.50.1485393206071; Wed, 25 Jan 2017 17:13:26 -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 h26si2156771wrb.231.2017.01.25.17.13.25; Wed, 25 Jan 2017 17:13:26 -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 sp=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 144C768A6D4; Thu, 26 Jan 2017 03:13:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B321E68A668 for ; Thu, 26 Jan 2017 03:13:15 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id d140so46814770wmd.2 for ; Wed, 25 Jan 2017 17:13:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=e4a9DpX5xRNzO0F3glmw1l8aGTqd+3SMAokZnUXpXDQ=; b=RVxNAJ5urI4ChwnOLszjVRvbGypG8qTgkxklhrKBEzRDnrOu16AEl9mMpTCRrulWxK vPJfu6SC7l6AkrgH4os+8ACGtaNyFfcpBpxWNs28It6xzIKdG51zmPMd22CvxpjanG9T nY9kGIjSUu+sVef1TI1DTCRBxZbTMZh6DOney+PYe/KNw+6T9+vLx0uuwYhiXJosYGEM sIi9zPH2qu1xK83Aj/3lajXDPu6N8Ni7O9XfjcwQbrmqzs4/gdTHK6HjqSEzJwv/M2g+ wskqM51sSOQTho+NAu+eVmmRpetSSnIDOmiwT7lkfGo3QKeuRwVNRASqSYinvE9EAPSw Ucdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=e4a9DpX5xRNzO0F3glmw1l8aGTqd+3SMAokZnUXpXDQ=; b=b9ZwYxy/hD+0rvE9gkc8sC5G2sJ8AvOeDx4GIJBjijh12tC/pdYoWoKKLA6yCqzci+ v3zbzm6CpQtdt6q5tVjx2kmptM3yKptj0pOQ2El+A8Jnrc2mb1ihamvr2eWqTiWFCInb T4h3uSOkp6uC4+lzbg9LlaL3z/jPsB+9EMvoHjW/GpwK8hCo66Cz7TLAP5lzaJDQayDP /EHFCNG3BXKRssoASQK45Hybz6RdVUiSU7ks99iJ6e6Hkb7JK9mAjVIOjnenBVbOawLV pGMDDc1t1fgoNDhfKmNAKtfHZn39MBZzMR4WWq6qDVAKM6nRDyt6j4SAfIPiG8hp/2MI Omhw== X-Gm-Message-State: AIkVDXJ1gdRsnT9WNtbrsJtd260qO+0Izkf3Z5t85guMt3zq332SR4a/erAJJNr4LMusUw== X-Received: by 10.223.140.145 with SMTP id a17mr207604wrb.1.1485393195803; Wed, 25 Jan 2017 17:13:15 -0800 (PST) Received: from [192.168.2.21] (p5B0954C8.dip0.t-ipconnect.de. [91.9.84.200]) by smtp.googlemail.com with ESMTPSA id g71sm1082826wmc.9.2017.01.25.17.13.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jan 2017 17:13:15 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: Message-ID: Date: Thu, 26 Jan 2017 02:13:14 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Subject: [FFmpeg-devel] [PATCH 6/9] pvfdec: prevent overflow during block alignment calculation 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" Signed-off-by: Andreas Cadhalpun --- libavformat/pvfdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/pvfdec.c b/libavformat/pvfdec.c index b9f6d4f2c2..c6652b9b43 100644 --- a/libavformat/pvfdec.c +++ b/libavformat/pvfdec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcodec/internal.h" #include "avformat.h" #include "internal.h" #include "pcm.h" @@ -44,7 +45,8 @@ static int pvf_read_header(AVFormatContext *s) &bps) != 3) return AVERROR_INVALIDDATA; - if (channels <= 0 || bps <= 0 || sample_rate <= 0) + if (channels <= 0 || channels > FF_SANE_NB_CHANNELS || + bps <= 0 || bps > INT_MAX / FF_SANE_NB_CHANNELS || sample_rate <= 0) return AVERROR_INVALIDDATA; st = avformat_new_stream(s, NULL);