From patchwork Tue Feb 1 18:52:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp887467iov; Tue, 1 Feb 2022 11:01:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2+D4Vlgk7fzMHyz1VfYruMHsWqfzgpBygwurYc0Ax8pyErIddF8pbgZPi1ET2gDACxUDY X-Received: by 2002:a17:907:a088:: with SMTP id hu8mr21304526ejc.439.1643742100341; Tue, 01 Feb 2022 11:01:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643742100; cv=none; d=google.com; s=arc-20160816; b=nczY3yPSHwpbGXhn0BIKKWqFDpC+iVFbKDmmCR/uURCRYbBj9OP26g5JYzz5MtkNSg kvkKxkG7pa44Dzc0UCyfZly5lCDLezLxMrYAmL8Za4PRN5XjRWfRpk11Q9J3IrDNgGw4 9LN+gekILvvk+97xMjs2ZWu/R9Lz6/tZomaQ5wfuvm1mSeU02QFcqskGOXaa4WFU47Rg WQ9Y1roPxe7VgVacZvkHmms+E15sfxFvlFvrDYHiOWMWT2P771WccyUfjOjWg5hIIYBO BV8d9tsfOAZ2a+3FzRkotsn4WpQp0B3XW37/VbyCYuaXCJak+cVNQoKeo/vNsuUW+FhG ya7g== 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; bh=B1n4dZe28WE3Y+3+3TNv6a3jBkdBbgxwH+tS16lDUS4=; b=K4E1fA+GXC7IesUQ3e7jLDhE8AMvu03J6z/g6js7IQm5nsHj+rxMvyFbyhU7q45MZC 3mwmx5te/DYU5UwV7B9HmN3x+9X3MqOJLpy1/g4mzqnJckznJJ4VkCLKUeFZoxLzKfOU 38X2JmIvQ9ndIDkH8v16WoWcPBBNE0kGV9Fh2tFJ8SJncbUvZxVK/guoPSUsIK9RBvwD AzCdy12+dfSeUkBPQ4AQqMpU4BSPpg9gjYsi5eIMSsDIt8N1qvXoozQ+Ci3lmZP4xLIF neIuWf8AX2fU4ZIPtGF3okUzOgsJ+hk2GoBH9JqBHrgFbmpAaFA20q5tMInmk6fk2fAI 9gYw== 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 o15si6253314ejy.329.2022.02.01.11.01.38; Tue, 01 Feb 2022 11:01:40 -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 4A41968B4A7; Tue, 1 Feb 2022 21:01:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C876B68B468 for ; Tue, 1 Feb 2022 21:01:28 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nEyIa-00FRcF-08 for ffmpeg-devel@ffmpeg.org; Tue, 01 Feb 2022 19:54:40 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id EyGenYMgoSgGFEyGenW60P; Tue, 01 Feb 2022 19:52:40 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=DOBmluuZNDg1u3nCuM4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 1 Feb 2022 19:52:39 +0100 Message-Id: <20220201185239.13450-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220201185239.13450-1-michael@niedermayer.cc> References: <20220201185239.13450-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNfvwkxXfjmXwNByXUrPffwtFx8IPX9lb0OXXjjFURv0NsLmeSMp4p0mQmTQoGVLTi9gcdznrXAGU+8GQSEKEJFfxez4Ct0pE/uWiT/NUvM0dv+m2Ql6 CX8EIte5wmtyywrtEEQ3hW4nKYmUT/ObOsQKJajXKMNDqttwo4CdyIy8 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/av1dec: Check tile_cols 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: iLE6+fo73K6z Fixes: division by zero Fixes: 43769/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AV1_fuzzer-5392562205097984 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/av1dec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 62d459cded..581f22a849 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -394,6 +394,9 @@ static int get_tiles_info(AVCodecContext *avctx, const AV1RawTileGroup *tile_gro s->tg_start = tile_group->tg_start; s->tg_end = tile_group->tg_end; + if (s->raw_frame_header->tile_cols == 0) + return AVERROR_INVALIDDATA; + for (tile_num = tile_group->tg_start; tile_num <= tile_group->tg_end; tile_num++) { tile_row = tile_num / s->raw_frame_header->tile_cols; tile_col = tile_num % s->raw_frame_header->tile_cols;