From patchwork Wed Feb 21 03:29:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7689 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp306661jai; Tue, 20 Feb 2018 19:30:10 -0800 (PST) X-Google-Smtp-Source: AH8x2277v5cWlsB9XqPEhOOGDTqA82Ym5VzOqXW0AG7Wu7LZ/0qu8/hMHT+BgBe8VblDp38C7Jgg X-Received: by 10.28.184.8 with SMTP id i8mr862846wmf.52.1519183810086; Tue, 20 Feb 2018 19:30:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519183810; cv=none; d=google.com; s=arc-20160816; b=cG/uTgoJY4AoGDUPMPKR52RbGPpooXfudzKXkwC9B/2bQCyVwMfW2j5cYka6Z9trJm kjUq+h1EPFfCS8W3fblA19vfszn8PgPf5zQKap9WB+E4xUg4y4xK57h+zQ5fo826gNG4 PT7YMZ3GwcIzrVUUoBbSL/4PW/ktb5SgNaISjejvQCyRH8gqdc4m+FbGSQAT/UiLISXK VN3op15of9ZmyYWpBB0Rrd3R0dKuTiBAy04ce0aPnrNpMNOZXeFvo89AVRlHMCoYvKeU SIqFM4HB2rPBHNhb0o91pkRRsAHmoTbZRuTETbyhkqQIgRSiKR/KescjAi5V860cb+kZ qmKA== 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=uK3cT3ExGUgTlcQJx+t+ZbJUPY63avcgTyQPZbKuQ5g=; b=kQdSmLJ6Lie+aYmhXvdIYi2w4vKUuzwPcN4IAxQ8WNqwvQ4/jk/hRgb/ELaS+TwUMv rklMSPsblmZ3n8ShfFs1Xxzi0Fkgn/m7ZBn9ItQDnA4RR7tDBEzFu+Bl7WRuitjeOVjT miyc6vgOlmPchJABfAYaOWfR2YKgxrWAbIbhCTb6LCsLuKjj2ZL11zEYnX2aQMC/bLWy 71mQbvv2sHzLBAl4eMmS54fHm19ROoEjUV+TNl43TL3Mbs6136YcuEiZwonolWuihiDB RednuV2/Ec3Z1Za3cRJf7Qs49lPIpG9R5eacjA+aAs05jjgP55XCYGJ2vCJfW7XzJUag xmkg== 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 o15si19648445wrf.105.2018.02.20.19.30.09; Tue, 20 Feb 2018 19:30:10 -0800 (PST) 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 55F2068A34F; Wed, 21 Feb 2018 05:30:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-1.mx.upcmail.net (vie01a-dmta-pe07-1.mx.upcmail.net [84.116.36.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F46568A345 for ; Wed, 21 Feb 2018 05:29:53 +0200 (EET) 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 1eoL6Q-0006SG-C0 for ffmpeg-devel@ffmpeg.org; Wed, 21 Feb 2018 04:29:54 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id DFVn1x00U0S5wYM01FVoEd; Wed, 21 Feb 2018 04:29:48 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 21 Feb 2018 04:29:45 +0100 Message-Id: <20180221032945.29394-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180221032945.29394-1-michael@niedermayer.cc> References: <20180221032945.29394-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/cavsdec: Check alpha/beta offset 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: 6183/clusterfuzz-testcase-minimized-6269224436629504 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cavsdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 06c752735e..c7fff67c06 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1067,6 +1067,11 @@ static int decode_pic(AVSContext *h) if (!h->loop_filter_disable && get_bits1(&h->gb)) { h->alpha_offset = get_se_golomb(&h->gb); h->beta_offset = get_se_golomb(&h->gb); + if ( h->alpha_offset < -64 || h->alpha_offset > 64 + || h-> beta_offset < -64 || h-> beta_offset > 64) { + h->alpha_offset = h->beta_offset = 0; + return AVERROR_INVALIDDATA; + } } else { h->alpha_offset = h->beta_offset = 0; }