From patchwork Wed Nov 8 02:12:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44573 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:f392:b0:181:818d:5e7f with SMTP id qr18csp93603pzb; Tue, 7 Nov 2023 18:13:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IFHbawPsWyg61tyfETD2RtHwV7aqf/bR+w8DOqAAlWmtub56r9d3UgYbEljZHD9cpRfemDG X-Received: by 2002:a50:954e:0:b0:53d:b59c:8f91 with SMTP id v14-20020a50954e000000b0053db59c8f91mr296668eda.27.1699409593947; Tue, 07 Nov 2023 18:13:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699409593; cv=none; d=google.com; s=arc-20160816; b=NtKKR5ZMqb+Oxcl+LpYIlJV5G2nAVHWS0xotVvk9j4v3er77cTAjb3fWTHqCMnu4/x WrY/ncjlfy8KUZ7HG4sbauvzxShwsZ7OngTdHynBj8S7h3zysObOzp4SneSnCsOWXIG8 YjGyJtFNAftZnX9JEs2xGo58Up568UCbpMkqTNZ4ibj3YNkbCUs1lyW6nwjItv6xSuW1 sWrHwRYnCfCu38fDUg7JZHaLGVspLosMbWBtRPA3m6eZf8iv75XUi0gnUB3omHQxD7Ak LVbJA8H6eab02Yuf16zpGkoJb5dvfFSIZNcSaXDZf6FVnGTKFzaFrhoR9Y4vwK9b0m2H e6jw== 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=qT87PQzLmqEjeIt4DrfJTnPdhAxkBKYbICsCUaT12xo=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=E2TfdSM8phCWHms+B8qFM8RuCsYZtnj8sDOTnQMYmeNrKDheRUyoPSIhgH36A7kfv2 skfcgSa/z8VKQfPRGDY8YlUBLXACIQbGkULBtBmOLG+te8pHxCHSYBAgBezA+McTnpWD MnwDj9prS/3Xbv58/SY94jz0ilER/LXNuaxhiGe2GOxx9eTwE1xDXPR36kS10F+i+em2 IfqN3m+utRopvk8TGWCelv+7Me92LBlWUtItecOXW7ToSQRH92f3KM2Cr4JZaWd4XCVH gyt9NhdBFQ1Ct4UjzErX2Wrb7Z6KZOUzShi+j6uqAgKHFftjZYaOw+BzxPTdxHJQ9Z/A WhHg== 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 eb5-20020a0564020d0500b0053da9766e6fsi1782981edb.639.2023.11.07.18.13.13; Tue, 07 Nov 2023 18:13:13 -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 12A0E68CBBE; Wed, 8 Nov 2023 04:12:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E83968CB03 for ; Wed, 8 Nov 2023 04:12:48 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id BFBE9240002 for ; Wed, 8 Nov 2023 02:12:47 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 8 Nov 2023 03:12:44 +0100 Message-Id: <20231108021244.8669-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231108021244.8669-1-michael@niedermayer.cc> References: <20231108021244.8669-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/jpegxl_parser: Check get_vlc2() 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: d8sK8FCYmScs Fixes: shift exponent -1 is negative Fixes: 63889/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6009343056936960 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpegxl_parser.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c index 630fc8a60bf..964f5a9ad5a 100644 --- a/libavcodec/jpegxl_parser.c +++ b/libavcodec/jpegxl_parser.c @@ -698,6 +698,10 @@ static int read_vlc_prefix(GetBitContext *gb, JXLEntropyDecoder *dec, JXLSymbolD level1_codecounts[0] = hskip; for (int i = hskip; i < 18; i++) { len = level1_lens[prefix_codelen_map[i]] = get_vlc2(gb, level0_table, 4, 1); + if (len < 0) { + ret = AVERROR_INVALIDDATA; + goto end; + } level1_codecounts[len]++; if (len) { total_code += (32 >> len); @@ -743,6 +747,10 @@ static int read_vlc_prefix(GetBitContext *gb, JXLEntropyDecoder *dec, JXLSymbolD total_code = 0; for (int i = 0; i < dist->alphabet_size; i++) { len = get_vlc2(gb, level1_vlc.table, 5, 1); + if (len < 0) { + ret = AVERROR_INVALIDDATA; + goto end; + } if (get_bits_left(gb) < 0) { ret = AVERROR_BUFFER_TOO_SMALL; goto end;