From patchwork Mon Aug 21 00:15:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4781 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.37.132 with SMTP id g126csp2385383jag; Sun, 20 Aug 2017 17:16:14 -0700 (PDT) X-Received: by 10.28.19.9 with SMTP id 9mr5857814wmt.171.1503274574346; Sun, 20 Aug 2017 17:16:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503274574; cv=none; d=google.com; s=arc-20160816; b=W1OHzbKOxAFV/Ow/25Hf9KIHhtF/vDgO000nY7LzOm1QoJh7Td2HIfuhx6IolLjAX9 JDSQ4pMlfpnH23oTmwqh62ikvbZboRF3juhnjUH8PitA7Vs7DsMGK5sH1Fd9AdR876zf FkBCnAgHjkBR6l22XoQZvEFNmmtRii259/9Mmj49pub4xN0L9ZmuzQEbu2zhYRA8uRz8 xukXv4rCB9k8ZP0A++duyNUVMbokrAb2rdYrJyMRAFJ04b4cDRrtomJz0R7slF94CVLG 7RQsKLvZRbAzix4NrHU9BHMaWEkvPMPsxKhEyHDo6o2vc7bcoElH9qspgKI+4X1WQWK9 kL8A== 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=W9xA9p3sZxNtRKhSSccBR4ni0YqGSQwEPsHRmu97tdw=; b=gT/RNm8X7AiJOviUTtnJTn0W+pTxGPE5b7KQqFd7IDuwXOWDowIsov8eVVs/BC8exM bEjlQ4zmbcsRVDOKDo8IY9RQB/BEOVy5d5fYAZyJnNd5R68W0JYomZyGvnTB+TyY1buZ XXlqiZVSYYI58nGs6ksx4CsnOSlHRX7tlqjwHuOEQhx6b9gpDL8kUT3nbrGuoanvPZ2Q N+0xrsvhAsXaGcmYNf/Dm1cu6h1RRsX/wAdzkYe332wiTeo5vZco25oPz0OeqX1vbJc7 QcqrF2dPJN4ocUfcA2a/jKJVwCYTnzUwDykcjMpMCbO0+2LousRN1QNZPReryvuyIfjU IGxg== 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 i10si5146218wmh.254.2017.08.20.17.16.13; Sun, 20 Aug 2017 17:16:14 -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 BA092689A32; Mon, 21 Aug 2017 03:15:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65E616808DF for ; Mon, 21 Aug 2017 03:15:50 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1djaNp-0008Vd-55 for ffmpeg-devel@ffmpeg.org; Mon, 21 Aug 2017 02:15:57 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id zcFs1v0050S5wYM01cFtGc; Mon, 21 Aug 2017 02:15:53 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Aug 2017 02:15:50 +0200 Message-Id: <20170821001550.10803-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170821001550.10803-1-michael@niedermayer.cc> References: <20170821001550.10803-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/hevc_ps: Check delta_pocs in ff_hevc_decode_short_term_rps() 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: integer overflow Fixes: 2893/clusterfuzz-testcase-minimized-5809330567774208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc_ps.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 21dbaf85a5..37eae226e2 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -225,6 +225,12 @@ int ff_hevc_decode_short_term_rps(GetBitContext *gb, AVCodecContext *avctx, prev = 0; for (i = 0; i < rps->num_negative_pics; i++) { delta_poc = get_ue_golomb_long(gb) + 1; + if (delta_poc < 1 || delta_poc > 32768) { + av_log(avctx, AV_LOG_ERROR, + "Invalid value of delta_poc: %d\n", + delta_poc); + return AVERROR_INVALIDDATA; + } prev -= delta_poc; rps->delta_poc[i] = prev; rps->used[i] = get_bits1(gb); @@ -232,6 +238,12 @@ int ff_hevc_decode_short_term_rps(GetBitContext *gb, AVCodecContext *avctx, prev = 0; for (i = 0; i < nb_positive_pics; i++) { delta_poc = get_ue_golomb_long(gb) + 1; + if (delta_poc < 1 || delta_poc > 32768) { + av_log(avctx, AV_LOG_ERROR, + "Invalid value of delta_poc: %d\n", + delta_poc); + return AVERROR_INVALIDDATA; + } prev += delta_poc; rps->delta_poc[rps->num_negative_pics + i] = prev; rps->used[rps->num_negative_pics + i] = get_bits1(gb);