From patchwork Sun Jun 4 00:25:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3827 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp786262vsk; Sat, 3 Jun 2017 17:26:09 -0700 (PDT) X-Received: by 10.28.212.14 with SMTP id l14mr3801689wmg.20.1496535969238; Sat, 03 Jun 2017 17:26:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496535969; cv=none; d=google.com; s=arc-20160816; b=IhrJE0Ue4paislixubhESAXLrRbQjqhDGrS0Udkr7QKcvbQVLqDyocPA9ZZfU9v97X rfDesUutGVAgHUCKmZ4M4vrBuWoPYYbPVYXc1GxwfZobJUkKzmXndOwkBEvXEjnsU/HJ 5hgYlYBnn4PeeMaS8BI6kXb+V9jR5UkaHMDyy5hCJ0wnh4ru1MXiRxathkSTfIwbw82P IzwXdaz9Fi+rNbzYX6OS72pZ272rxDCBu3d11KtHC79Ds5rkVrLqWOrkd+Rb9eKgESI+ n3oHaC3gLzd91fKAsT8WZCbHFa2XTk/rFk0J+EwNqI3v5m55AvyvENusfWGzF5ucgifE sNJg== 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:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=IhHPFTDH3CuZYYOURSoBoWBYm46T3BerrfvIc7EMUSk=; b=c8qKPDm8yfWfGh8EliN3vu5k06QHz7JlpzCcDpZvBfK8J1kZlwtgQxN6NgHvMdVqj8 jPmd01DyYyWqvKF3y86LXwB/zaqck0680oJCTbDZTx1flFRsDONfI2jUyAmmSVjWSghO bNVX0h2XeqlhphtQy8gevfKojAg/PiJ9YzpUnPZx6iLRxtMMygHznHJLeqC7OQcwBFWe wABf+SwaE/ymbEC3Lv6uFDHBHPJ3UfTrqZ3jzSsjCL/STnrOWXwLGYrq8WOKn+1Qz4KA vDcIjGTA8NAuFL+jiu29TeUjmlFre3rddRLvlywdzgGpAMv+9BDfjpvYGMZVZVghPiyI PPNA== 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 x188si7321388wmb.136.2017.06.03.17.26.08; Sat, 03 Jun 2017 17:26:09 -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 59170689D4F; Sun, 4 Jun 2017 03:25:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-2.mx.upcmail.net (vie01a-dmta-pe01-2.mx.upcmail.net [62.179.121.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 635F6689C62 for ; Sun, 4 Jun 2017 03:25:50 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dHJMi-00055Q-8H for ffmpeg-devel@ffmpeg.org; Sun, 04 Jun 2017 02:25:56 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id UQRo1v00Y0S5wYM01QRpCU; Sun, 04 Jun 2017 02:25:49 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 4 Jun 2017 02:25:45 +0200 Message-Id: <20170604002546.5707-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170604002546.5707-1-michael@niedermayer.cc> References: <20170604002546.5707-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/utils: Fix several integer overflows. 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" Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index cde5849a41..feee7556ac 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2278,6 +2278,9 @@ void avcodec_parameters_free(AVCodecParameters **ppar) int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src) { + if (src->extradata_size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) + return AVERROR(EINVAL); + codec_parameters_reset(dst); memcpy(dst, src, sizeof(*dst)); @@ -2341,6 +2344,8 @@ int avcodec_parameters_from_context(AVCodecParameters *par, } if (codec->extradata) { + if (codec->extradata_size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) + return AVERROR(EINVAL); par->extradata = av_mallocz(codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!par->extradata) return AVERROR(ENOMEM); @@ -2397,6 +2402,8 @@ int avcodec_parameters_to_context(AVCodecContext *codec, } if (par->extradata) { + if (par->extradata_size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) + return AVERROR(EINVAL); av_freep(&codec->extradata); codec->extradata = av_mallocz(par->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!codec->extradata)