From patchwork Sat Feb 18 23:18:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40445 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp862798pzk; Sat, 18 Feb 2023 15:19:03 -0800 (PST) X-Google-Smtp-Source: AK7set9DIPRQD0vkR1VI+HRsVjNZpDYIwHGWDISnz9M0TX1TcErJqbTTfh4AHNyvWGIkbl9s8rLk X-Received: by 2002:a05:6402:40e:b0:4ad:73eb:9566 with SMTP id q14-20020a056402040e00b004ad73eb9566mr258859edv.38.1676762343526; Sat, 18 Feb 2023 15:19:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676762343; cv=none; d=google.com; s=arc-20160816; b=QjxFGmulC+AetGWGITKEit439AYn8n8bwy8YaTLOUItsMAwGFoPahLVWPZsvPZ+Y5e itmA9SZEa1OZmVqnXcaeDFSrJFjVeurzAGatY/k19EZ0+OouXb6CrFqlaVFpjIkiBIKP 5fPtV5jxxj6mkd79TL4B8t/KV5M6l/P/PPb2C/Gd0Q+QlVDwrODtwXVpJW7b5kPjeLws xKM7hINq26eBe+OWXtfNprKzzHr+HIpe2crHkONWmzZgYHJWpO65dfJ/kk4iM5NMRNnJ 9dtQQfkXed6RulverNLSHQQFb2tjjtWYdm/cQ9NGUEzRad8fPlqtMVvEh3Ka1oxeBolS dqdA== 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; bh=5WP2zrqjFYjK7pDEyIhwHiaANpeVyic+HHXAgp5YX6E=; b=R+B/4fmAORiAs8Sisn5U+zaxj61kUafheUaYaxcAAussCbNQFQ45Ef/nYsiUAg5yD2 l2cdo8xL5drCF0qpUS9lg6R/Yo+AXPQh9NOCzzfEFKuYSmkMX/VhxNTFBljpGwKOal0M qGBFHHhpTjI/oRf5XnJcGcd/fecFphtzDpHGYtBIIO5vaj+w1p2xyXtYHyBwPcIVfIfp 1gVseGC5cSmcUDcb9pOI2twtuNSwXNAHC5lmui7xt9yCmncB7w753CcbY6lgCUgtKcVA eqzhKTV3XVdwYHYCZad4eWhWf0OShNfvgF6OqwXHealkPQ8KzKU8nSRR4p/zs5HQgIE1 hSMA== 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 ay10-20020a056402202a00b004acc68a3d5csi9952479edb.304.2023.02.18.15.19.02; Sat, 18 Feb 2023 15:19:03 -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 4D29A68BF08; Sun, 19 Feb 2023 01:18:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88FEE68BE7C for ; Sun, 19 Feb 2023 01:18:52 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 9DB2960004 for ; Sat, 18 Feb 2023 23:18:51 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Feb 2023 00:18:48 +0100 Message-Id: <20230218231850.20522-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/ffv1dec: Check that num h/v slices is supported X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: t8rCa7jH47At Fixes: out of array access Fixes: 55597/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-4898293416329216 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index d74786cec3..180d24e695 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -475,6 +475,11 @@ static int read_extra_header(FFV1Context *f) return AVERROR_INVALIDDATA; } + if (f->num_h_slices > MAX_SLICES / f->num_v_slices) { + av_log(f->avctx, AV_LOG_ERROR, "slice count unsupported\n"); + return AVERROR_PATCHWELCOME; + } + f->quant_table_count = get_symbol(c, state, 0); if (f->quant_table_count > (unsigned)MAX_QUANT_TABLES || !f->quant_table_count) { av_log(f->avctx, AV_LOG_ERROR, "quant table count %d is invalid\n", f->quant_table_count);