From patchwork Wed Nov 8 02:12:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44571 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:f392:b0:181:818d:5e7f with SMTP id qr18csp93464pzb; Tue, 7 Nov 2023 18:12:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/BAbNUMHPyE6g4h6JCWWhCFvylQjX5NK2+FhacENKRGxVEuq7rB6psrR1ofAEFD02ZRwF X-Received: by 2002:a17:907:1b1e:b0:9de:2b93:cab9 with SMTP id mp30-20020a1709071b1e00b009de2b93cab9mr261014ejc.8.1699409576540; Tue, 07 Nov 2023 18:12:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699409576; cv=none; d=google.com; s=arc-20160816; b=ThGydL1YsZIHY3wy4Vjx7NuVNJhcCak3I7IwR42IkqKYvdx5R7lzgLTc8jgFgKs4sb 4fWy8R57hRpn08qJAFklQXj18q835ZfZm4tBWb4DhxpQ10MTcTQvBoKCPf73I+akgglB zbiA2s3DoAd5kkU93qLzd3kudt8jDHSqhJaCJR0B6Py8khoSc08HVCAi7z/8p+wgGApS dmM1XfVX6qELO9MqZWGHzwhk+yME/mUN46YfgveksE8z9vfQ6xwcSfFdBxNT+wnJLe7A Qifju5BP2gBjT2ghafBs8e/YhTfXqN/KOsnfGVTWBxRvbPQuaGiUwh/5s2ggUl991E/P aBMA== 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=1MdvQ7iKH78Bht4cpxVlbjQTu/h3omotaiT3IuMc9Qs=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=dhNWPl0AW+hdOgtSeOaoas3YQus5EGhguW1bEKx1w0V3GR4iQAwuDJ5hDls6KGRd2G 1/TJsy1HwS70gUfXZwTUSFEIlq3wUdpvHAaXgxZxW1yCqmtseYYw/oUq9jf0gO3ATcAB xB8iBvpve3CCvvsYprtzdfgbTBir4IhrnzouVPvGih+VQa7zNrkO+ImK67aunZHR6L7j ZNy142ED4P0b1H3aCxU8zFt/Mf49qUI7TFIIAHuWRhpFKXII17PqNvSx3JQoX14mXqAK A0qQW9bV158mxi1BCAFgiiy2kqs1FoVJFRGsaYwq3XrvClcgeVTodBKB5TC9AG1iBvVE +hLQ== 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 du9-20020a17090772c900b009de293f39edsi1666888ejc.119.2023.11.07.18.12.56; Tue, 07 Nov 2023 18:12:56 -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 D907D68CAE4; Wed, 8 Nov 2023 04:12:52 +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 9055D68C82F for ; Wed, 8 Nov 2023 04:12:46 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id BB4D660002 for ; Wed, 8 Nov 2023 02:12:45 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 8 Nov 2023 03:12:42 +0100 Message-Id: <20231108021244.8669-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avformat/mov: Disallow FTYP after streams 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: IpxL8b7nTJ+y Fixes: Assertion !c->fc->nb_streams failed at libavformat/mov.c:7799 Fixes: 63875/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5479178702815232 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index e8efccf6ebf..34ca8095c22 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1222,6 +1222,8 @@ static int mov_read_ftyp(MOVContext *c, AVIOContext *pb, MOVAtom atom) int ret = ffio_read_size(pb, type, 4); if (ret < 0) return ret; + if (c->fc->nb_streams) + return AVERROR_INVALIDDATA; if (strcmp(type, "qt ")) c->isom = 1; From patchwork Wed Nov 8 02:12:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44572 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:f392:b0:181:818d:5e7f with SMTP id qr18csp93528pzb; Tue, 7 Nov 2023 18:13:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFnV/K3Z3fB67qCpieX+yh1hNp4VHn3LKd5aIZ4bAkYKFYWZV5XesHLEbD9nPt5l8ITuSgu X-Received: by 2002:a17:906:da89:b0:9bd:7f40:caa5 with SMTP id xh9-20020a170906da8900b009bd7f40caa5mr239997ejb.77.1699409585208; Tue, 07 Nov 2023 18:13:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699409585; cv=none; d=google.com; s=arc-20160816; b=somxjGZcHLeWkunoGAYX6Esnz4yOX1hENMxlmLXmnp6QTBAcigl9iQNpDlW+wWOqH/ 3U2B7sraFp91Hi1TyRfcovGGX0immqLJswaV3yZ4iQLUOyzE4CuWL2TLAmWHj0/qn64N 5ZcWPVzf0/CEygFASQ0iyX/OQn+j2icj+2C74DQDGcPKvV9ZoJvgu8BAMe/38BJAivhI einROKTrxBTBYUvDNkLz3op47eLmpwaG2OnZqiySD529/ht/blxbi/DHVKVvNIGsP6MK daPg2cqCdwVo2WpWuwN5fvTtFksw7DrZeLqGAfSsHTwgpz1haiv6AswJtLS+9BcZ80Ox Rrug== 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=KGQh9Vh3CcmJ0i93MqckwU/DVgspqiNYHchh0oB7ZkQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=a1JcoWK2IKxgHIFrdgTxmZQ3Ppp71ef8K/8t+3QdQO05tbNGOrAIybF17eEBKi3tiK dgoVVsPqUFVTNU4UP3w2kac0eNIVEE5otKOcC13XHVuT09FcGEQb+rcXPQzO593sV3+Q YQbpduIV/lwEXF/0E56UhoiGz1lXcgW12F/am2MxwSetKNzinY53rb0uzHQS2WKqLJFR xXqjAyfOBYpCwzK8vBhuWAD8197KY4uFg2tsgZ7wF0v1nqeQJEFqi7WMHfycjKPnMGO+ +Wd0tBVabEFnNjvq3xmXFZxvDb8Vvg2gZ5aOlr7pcCanQ354cRcmI6ClbfUjoHMd2rR8 v00g== 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 5-20020a170906014500b009e153ae45aasi1491785ejh.744.2023.11.07.18.13.04; Tue, 07 Nov 2023 18:13:05 -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 E97FE68CB03; Wed, 8 Nov 2023 04:12:53 +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 B9BB768CAD8 for ; Wed, 8 Nov 2023 04:12:47 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id EC8E71BF204 for ; Wed, 8 Nov 2023 02:12:46 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 8 Nov 2023 03:12:43 +0100 Message-Id: <20231108021244.8669-2-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 2/3] avcodec/4xm: Check for cfrm exhaustion 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: AJ/N1XQ7rVrZ Fixes: index -1 out of bounds for type 'CFrameBuffer [100]' Fixes: 63877/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FOURXM_fuzzer-5854263397711872 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/4xm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 158b37a38bc..cfe65c178a4 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -885,6 +885,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, } if (i >= CFRAME_BUFFER_COUNT) { + if (free_index < 0) + return AVERROR_INVALIDDATA; i = free_index; f->cfrm[i].id = id; } 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;