From patchwork Thu May 11 11:01:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3648 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp639979vsd; Thu, 11 May 2017 04:01:54 -0700 (PDT) X-Received: by 10.28.136.146 with SMTP id k140mr449481wmd.55.1494500514357; Thu, 11 May 2017 04:01:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494500514; cv=none; d=google.com; s=arc-20160816; b=cQiMsBN5nc9TLaitGCjpqVekniYrpicZhnfzaoxyoFU8A1Nc3inJEqbxxTJnCrOvWd o57ihvIysM4oKbHHSeHKk5JL9/NkuyEBVQYP5zoc2CeKv7bxVOejFl/8RnRxvRYPlYMe XS4GmcUrDSC7GCX3AKhcZhY5wSqWOMEw2VqpJ7yVytHZjVw/CyEW3kIemtvpH2B0OCj+ tElzgZWRn9vnhrTNpQyznN3BfdB4ix31SOZK4B3aNRrG91ukd5QQnRkmHSHXXuFmEGa4 yY6LnK9cU6DbFu8beArkWspVJLIu5rM7h/azAZakjOmt54g4xjt7WFmhvU8Flt8EE5JF DYwQ== 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=9D/yAzIoBMOUyXHdLhkE2HP3wkBf3vGJMv17FMUOH/E=; b=wICTI10rCF6Ms0WXHBMae35V/DDMk6czPfXu6RuioQ/y1aIwH9KgARPyPDqtoqWrnd b8kjBVpX7DxDeP3w2eYugY4qcUhzyqV/a4CIn6OUMmI5L3aqNcPSNvpQ2n0JUnLqzEy7 S2/g+QKfSwJMdcqBJTdJM5nOL+IacO6QE76mJyw24bgJJXse/WbnjqislezgmDIQLUiX xAu7WvBxoEqfOhTtyFdM6tEDOuDzF3e8UZgcgm8RqPW6kdFw243Uh0fZw/ot3H5597w/ VFuevGRwSxWZgC17R5/RnTD6ZiVK73OiDxcu3J4KBE3CKOZHqlHcFqN6QwDekUHYNaaU CQrQ== 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 j38si1632339wrj.331.2017.05.11.04.01.53; Thu, 11 May 2017 04:01:54 -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 090346898B7; Thu, 11 May 2017 14:01:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe07-1.mx.upcmail.net [84.116.36.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91D5A6883D2 for ; Thu, 11 May 2017 14:01:38 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1d8lqr-0004qQ-53 for ffmpeg-devel@ffmpeg.org; Thu, 11 May 2017 13:01:45 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Jz1c1v0260S5wYM01z1dED; Thu, 11 May 2017 13:01:38 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 11 May 2017 13:01:36 +0200 Message-Id: <20170511110136.20338-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avcodec/avcodec: Limit the number of side data elements per packet 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: 1293/clusterfuzz-testcase-minimized-6054752074858496 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/avcodec.h | 8 ++++++++ libavcodec/avpacket.c | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index df6d2bc748..173c083a86 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1593,6 +1593,14 @@ enum AVPacketSideDataType { * AVContentLightMetadata struct. */ AV_PKT_DATA_CONTENT_LIGHT_LEVEL, + + /** + * The number of side data elements (in fact a bit more than it). + * This is not part of the public API/ABI in the sense that it may + * change when new side data types are added. + * This must stay the last enum value. + */ + AV_PKT_DATA_NB, }; #define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS //DEPRECATED diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 369dd78208..200ba99f34 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -298,7 +298,7 @@ int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, AVPacketSideData *tmp; int elems = pkt->side_data_elems; - if ((unsigned)elems + 1 > INT_MAX / sizeof(*pkt->side_data)) + if ((unsigned)elems + 1 > FFMIN(INT_MAX / sizeof(*pkt->side_data), AV_PKT_DATA_NB)) return AVERROR(ERANGE); tmp = av_realloc(pkt->side_data, (elems + 1) * sizeof(*tmp)); @@ -437,6 +437,9 @@ int av_packet_split_side_data(AVPacket *pkt){ p-= size+5; } + if (i > AV_PKT_DATA_NB) + return AVERROR(ERANGE); + pkt->side_data = av_malloc_array(i, sizeof(*pkt->side_data)); if (!pkt->side_data) return AVERROR(ENOMEM);