From patchwork Wed Jan 11 23:54:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39984 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5132678pzb; Wed, 11 Jan 2023 15:55:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXvakgJ1s1STY9eDl9uFIXy7xupbGwprfNb3lr1g1YIy5xjm22K8gRk99McpsBQXOZOhkvcO X-Received: by 2002:a17:906:b1c5:b0:84d:14c8:b669 with SMTP id bv5-20020a170906b1c500b0084d14c8b669mr18652146ejb.77.1673481326346; Wed, 11 Jan 2023 15:55:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673481326; cv=none; d=google.com; s=arc-20160816; b=q7bcfZEaCNep8D1reqXPXJKsRqwF7IK+3z6Iw2RF4/Yu0x38iRUjPTLOjNHKdETw5R 69f+/X3xYlzgtLx1gIxUIakm7bZXIOFoyJjINyEbnq30EE+0oSj7J87EMJ9vWcdX0FyQ hTf2nTNdS8HrvQMvWV4pRh/RMzb+B4wYykMB2FmbwXbkB6D75mG4rXFApI4aHQKu+FNB +K5IOf9lKdoFl0BMWs7YaDgPJf7jnoED+CRtk8Vkv0S7Q2wH7/gSKWkNP505BDl+ijiJ 7U902/93ZSotJiQbuNncCRloGbiiVvGWH0M0Jzz4RG/0CEZuj7gZoQl5T2jVt0KOxnTK Pbhw== 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=z3Gi/aSD0TXhcYaq+KjLBcwHEVqATNQruO5iM2Tcp7Y=; b=BCZBYn/P3GDS+9JjekmrQwHDd3V3Pqkg9pBIEnpYgbQo8FNmnXrXe3AUPK2B6CYz4U T/Cqo7kRgEPG/a7cc84G3r7V85EoGbuxnTldnQy8VC9BuNV7MNb8h8orM59Nw0EA7HKY OsnBcpvV+ViSHSoJOaf5THSl8fPa3j+EGdHeJh1DcCQGXM59EGPvihWbppT8nALFj31m 3h13T7KKfANKrdArkAQvhfyBjFn7r6CLkU64jJu/1sLDBRr2b4O26EaiVixyQ75qxKBI X6miSgpOPELTBJvcmxQsvYl0B4YZ+aS7/8D9rCuPekjaKXugS3SOdwaEshcKm89XRbjz 6wgg== 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 gn9-20020a1709070d0900b007aed5ffeffbsi19804039ejc.78.2023.01.11.15.55.26; Wed, 11 Jan 2023 15:55:26 -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 39F6D68BDA5; Thu, 12 Jan 2023 01:54:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C56468BD94 for ; Thu, 12 Jan 2023 01:54:38 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 4E1C61BF203 for ; Wed, 11 Jan 2023 23:54:37 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 12 Jan 2023 00:54:32 +0100 Message-Id: <20230111235432.2135-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230111235432.2135-1-michael@niedermayer.cc> References: <20230111235432.2135-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/tiff: do not try to read a value from a 0 value linearization table 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: 6j36ByhC8bib Fixes: index 4294967295 out of bounds for type 'uint16_t [65536]' Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-6666195176914944 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 1a1879de89..c3f67860db 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1451,7 +1451,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) break; case TIFF_GRAY_RESPONSE_CURVE: case DNG_LINEARIZATION_TABLE: - if (count > FF_ARRAY_ELEMS(s->dng_lut)) + if (count > FF_ARRAY_ELEMS(s->dng_lut) || count < 1) return AVERROR_INVALIDDATA; for (int i = 0; i < count; i++) s->dng_lut[i] = ff_tget(&s->gb, type, s->le);