From patchwork Mon Jul 24 15:34:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4441 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp4385479vsb; Mon, 24 Jul 2017 08:34:53 -0700 (PDT) X-Received: by 10.28.88.9 with SMTP id m9mr4985201wmb.57.1500910493689; Mon, 24 Jul 2017 08:34:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500910493; cv=none; d=google.com; s=arc-20160816; b=UPf8AHll0RwyiRFtAusMMxPwGud7TSeTKpqND23L3b2896rNvUnFYefopqthURwjGQ rJtEzxGpH2jQiG7AzO9Sq79tcSQo85LiLfKlPHrdddcIQo4U2mBod8c1gbGJWPoTbj1W wrpzPJgj1fovbRpN+bbr0M8QVlzX5tcpdRj/nzZ7yIE4E9hR6kZ7HiC6gpN0uemKZ4vB N5gq5CeJI2GlOfTb4iu2LZ0OPRXitvTLJPtC0snlFBJTA9sHfEb2MMT6kcLG64SioojH KZS55V30MJ5uQTJRQQszMGU8SDeljRGKgCzoD1qBTtBfyAV23iNi9ZWVAlFdQExqDTyZ vEUw== 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=1CCCxWsnbhZhlAUw1S0cvng4SWIiR542p5CFcJ0aJac=; b=B+O3mXo6HQUa2SW9Bxlo9PcWD39/w7YV3Z9p1Ow7rxKFxnWekcvE1JY4XXqmESdLGW PEvhTKpphXilVGo3fU3Q3/E1hMIZK8IAAAFH03rlLkN1tRBpPFwQpJmx6zNO/LSXO2q5 pqKLla8BwuVzBOU+u0jiA7Df029+OueUy32Cjb8N6eY3+jMMdd5fG83K8vZIt/ZVbijH mR+M4L+bTQov2KodTDQAljjqkjOUQO4xjKJEh7cRbJSmYewWfIpQNMRus9zW9a25G9YV AoQQ08/PT7q1yJ+h4ihDF1IKsBe5NkWbZaNnfa7SQT4pAKFKCBZr5gCwdi0AIrkrnZ+t ogUw== 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 j1si15435824wra.238.2017.07.24.08.34.53; Mon, 24 Jul 2017 08:34:53 -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 425CC689B0B; Mon, 24 Jul 2017 18:34:35 +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 C7334688395 for ; Mon, 24 Jul 2017 18:34:28 +0300 (EEST) Received: from [172.31.218.52] (helo=vie01a-dmta-pe05-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dZfNW-0008Hh-5R for ffmpeg-devel@ffmpeg.org; Mon, 24 Jul 2017 17:34:38 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dZfNQ-0002OA-Re for ffmpeg-devel@ffmpeg.org; Mon, 24 Jul 2017 17:34:32 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id ofaR1v0160S5wYM01faSmx; Mon, 24 Jul 2017 17:34:26 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Jul 2017 17:34:24 +0200 Message-Id: <20170724153425.21586-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/hevc_ps: fix integer overflow in log2_parallel_merge_level_minus2 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: runtime error: signed integer overflow: -2147483647 - 2 cannot be represented in type 'int' Fixes: 2702/clusterfuzz-testcase-minimized-4511932591636480 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc_ps.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 7358b318b0..21dbaf85a5 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1432,6 +1432,7 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, int i, ret = 0; unsigned int pps_id = 0; ptrdiff_t nal_size; + unsigned log2_parallel_merge_level_minus2; AVBufferRef *pps_buf; HEVCPPS *pps = av_mallocz(sizeof(*pps)); @@ -1629,13 +1630,14 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, goto err; } pps->lists_modification_present_flag = get_bits1(gb); - pps->log2_parallel_merge_level = get_ue_golomb_long(gb) + 2; - if (pps->log2_parallel_merge_level > sps->log2_ctb_size) { + log2_parallel_merge_level_minus2 = get_ue_golomb_long(gb); + if (log2_parallel_merge_level_minus2 > sps->log2_ctb_size) { av_log(avctx, AV_LOG_ERROR, "log2_parallel_merge_level_minus2 out of range: %d\n", - pps->log2_parallel_merge_level - 2); + log2_parallel_merge_level_minus2); ret = AVERROR_INVALIDDATA; goto err; } + pps->log2_parallel_merge_level = log2_parallel_merge_level_minus2 + 2; pps->slice_header_extension_present_flag = get_bits1(gb);