From patchwork Sun Aug 5 01:16:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9891 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1743694jad; Sat, 4 Aug 2018 18:17:42 -0700 (PDT) X-Google-Smtp-Source: AAOMgpchLoPQ+BxVcFnOvH8/r48RHapYbnfrqIQQ1JFNC6Vw1v9VteaLwEf9Q8zp7XpAVIrrNxqr X-Received: by 2002:a5d:6550:: with SMTP id z16-v6mr5973047wrv.194.1533431862583; Sat, 04 Aug 2018 18:17:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533431862; cv=none; d=google.com; s=arc-20160816; b=o9c37OhUtzLJwZZBuG4pGwKePXiPWDVGqcK43Q0PLBC66YDdJThhJJd1Mrc04/GWwa oDBxcomVKgAO838pRkhfJ7JOoTCZSzt8XMztS81Q4vCe1EFdBM7OSzOPA8dn1KENQzRG 0WqILeuZRX2D7Mp63OJSKb/xdD6ifhsQP0kQkDIzXemu/mkQeml6oMsufXZaBlEUw3TY iMHoryl0nsFYrwdaZHC7+dSFkDSAlpbUE4j3ho89ooSCDJOXtjIURx1eaVguXVvgefFW PQzChqkSlgQxPMeCJxHoTt3RaDUHzmS6eiJbpmhvb61Pq82Gm8w/pLWWdWsndsEBNX7K AZAA== 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=piAyTPTQm7fZnlhQ2Jg0LRchKYgciSETm48JuNSEevU=; b=aN7leA4H0BLGw5FgEnMJmX3XxIFQfM+uUB83TG3SRfnLs/7Mvg+VT2lmE2pu18tq90 IfOcQT0bQk5rCgzU4OJxu0MiskNyI5kEiIBTQVGVmDPc1CogWLpcpUUMIlsLCzqWfNmH +vUzbLMMSXu3A7ADhKmmBcH2T4Pt8JVW5ne9dW09mUC4lCC3gFmud6TAWi+BkCc31rIJ j2GhAi8OrtoD/NX240jNmjgoJsfOkmv703zHqWW78KLYigz+9wsjzN7NzgVDx8FZBLcO DPCwQNsf50DeVs6TpznpJX7/NezpBO1ADhhvxIyk5OlG0coLezH1BEMr2QVQjSiPJrev t1gw== 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 a140-v6si2545019wma.87.2018.08.04.18.17.42; Sat, 04 Aug 2018 18:17:42 -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 85A2B68A349; Sun, 5 Aug 2018 04:17:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C535A68A28A for ; Sun, 5 Aug 2018 04:17:06 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fm7fh-0007Ka-UV for ffmpeg-devel@ffmpeg.org; Sun, 05 Aug 2018 03:17:25 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id KDHF1y0170S5wYM01DHGkn; Sun, 05 Aug 2018 03:17:16 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Aug 2018 03:16:42 +0200 Message-Id: <20180805011642.5290-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180805011642.5290-1-michael@niedermayer.cc> References: <20180805011642.5290-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/scpr: Check for min > max in decompress_p() 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: Timeout Fixes: 9342/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-4795990841229312 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/scpr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index 72f59d5917..d1e47b09ac 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -525,6 +525,9 @@ static int decompress_p(AVCodecContext *avctx, if (ret < 0) return ret; + if (min > max) + return AVERROR_INVALIDDATA; + max += temp << 8; memset(s->blocks, 0, sizeof(*s->blocks) * s->nbcount);