From patchwork Mon Jan 30 23:45:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40183 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp3799437pzj; Mon, 30 Jan 2023 15:45:40 -0800 (PST) X-Google-Smtp-Source: AMrXdXsKEMsSxaI0cOnCAJXHtA4MNcVthvu1mHfpyG4wtd0pWQRalZ5y8m/2gZdXJVlBCxsxBn9z X-Received: by 2002:a05:6402:3898:b0:45c:835b:ac64 with SMTP id fd24-20020a056402389800b0045c835bac64mr60016375edb.31.1675122340463; Mon, 30 Jan 2023 15:45:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675122340; cv=none; d=google.com; s=arc-20160816; b=NwOol/iME0wXs94Ni18AnA731lG7aHTIK/ciU5spejfSFjVuTI915O0ObL1f9OG6w9 BJLewx2o1wU1Yz5jjxqW06LGW/KgPeaDQwiFp+774QdBcFFhRrjq0ZqFJjUWKJ38ouHH JmBZqu9Xhxe7ERa8OklHEqRIr4pKwuhvOk9CAYkCTw8vF/4B7P0/cSLDj/ivac/1uuf6 MTQt5MTnlxYng+Mq75SDu9AZEySeFDYKH4ES7P1tC2IxJeialMw2VFL+YuENiYHZ/Zvb fwGpgQXQdqnRE5OKBJUwL/WGPDHNoaumScghlyCtKlTjvRDzcL0w4JdOHZ+MSypmP+Ts ZdsQ== 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=j+UnzFrPHwEWq6UOoXvPRy6eWp9fS5iMxvYrZwg6MlA=; b=Hha1gnT9Upf5kS1hzjOJ8c06oqu/TrDaLDBQt6nRIhjXrXGTGdg1819FF5Mj3rEZzO HzloLbIDUE6zP9675nBZa6LrfU2gWMKHjPN90LAqiPMzC4xJPoof4GeTsDF69p+SyfFz S54aH2fmdRDevX89YaT1DhK1nDmXoEKmsBhM39zpAgnODvbZGoOEpy+FRRZycWq4YtYs B44Nlv+plu4QJnFfyhIGC5GKp3WEzLEITS7uFcrye/MyCdAVg72a0grA3DIdWBhgV0na YdNwtD477p8vpr7aTETprXWBONSBy4FXfP/cOY1t3iChJaboDW/x/gTjgDlnvxu650VK qAlg== 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 j13-20020a170906104d00b007a072b8240csi16080935ejj.927.2023.01.30.15.45.39; Mon, 30 Jan 2023 15:45: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 CE96668BE00; Tue, 31 Jan 2023 01:45:35 +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 EBA0E68BD3D for ; Tue, 31 Jan 2023 01:45:29 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id F01861BF203 for ; Mon, 30 Jan 2023 23:45:28 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 31 Jan 2023 00:45:25 +0100 Message-Id: <20230130234527.13149-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] tools/target_dec_fuzzer: Adjust threshold for BONK 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: NP0Y3ZYPT4hA The decoder is quite slow with max n taps Fixes: Timeout Fixes: 54063/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-5087362407596032 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index a20345db5c..127d534c9d 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -215,6 +215,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_ARGO: maxpixels /= 1024; break; case AV_CODEC_ID_BETHSOFTVID: maxpixels /= 8192; break; case AV_CODEC_ID_BINKVIDEO: maxpixels /= 32; break; + case AV_CODEC_ID_BONK: maxsamples /= 1<<20; break; case AV_CODEC_ID_CDTOONS: maxpixels /= 1024; break; case AV_CODEC_ID_CFHD: maxpixels /= 16384; break; case AV_CODEC_ID_CINEPAK: maxpixels /= 128; break; From patchwork Mon Jan 30 23:45:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40184 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp3799515pzj; Mon, 30 Jan 2023 15:45:50 -0800 (PST) X-Google-Smtp-Source: AK7set863TZI8eEOxRLbgxofzGhCHepKvdbg9+3knYNgOy+0gg7lb5e1uXHeaky3jcASuunZlhTe X-Received: by 2002:a17:906:4912:b0:878:4e83:b058 with SMTP id b18-20020a170906491200b008784e83b058mr19675090ejq.1.1675122349983; Mon, 30 Jan 2023 15:45:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675122349; cv=none; d=google.com; s=arc-20160816; b=e7Ewv6uK1E+7fiiyplxVbJLyiQFOY1Vr/4sg3iz+QJgB95ELqVAuc9C9JpbUuGTQBA xYrLfDhEe/z58WthLsSskYPaP6GN1LcvE8kxXixBo+k4E9Le2ONfPeT2PFAzvDTeZtk2 ABnBH22y9lK8WEaJ3rYLAkIPRsmb6hXMIuZ68HGrtD52HMoeIlQ0SdaBxc435sAbnQ6b 1em4DR1HHowgfHQbNqdvKiSzysQJyGKVVLvjcfhClAtIEdY+X1rCoyhksYWvqUqMZxEi aokTWihYb9kl9kx8IGEaKBmWDHc9/eh1Y+a4OeREmL7iQsFFeREGvJ23Bg0SIKPOXj4D fCQg== 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=/dmRd81KM/ksrWobSpEa2uA4gcfVSixO3iOVTjtwZs0=; b=AqzOMxu8UGC7OIRLmUYrS0mLAs1uDnrPfrvphxuTOnTNHFVSUOgnDZXXs8d+Qj4fPG maDc9pYJl3Jb7+9S/gxrTVu9d+dbxARGp2SGLFsG8CfDIKwhrt+EohVZuxdWeXdnCYcw n7uNHoDvMf8V6zikJeBNNsed6lGNqTNE2SXjCjXyGDSjyw0W7ei/o3bDonJbljxIedQq r9rhgdsTkn35boxwlh/sZwzg6S7E+zb8V6NyWncIttyB+o7pu3SYyqy2/LDcftXbHDGq KVTrxtl34C4h1yOjOE1oJJY5IeaPk0SLSNJgB1rU2SKUaZvHxgr2sq3HlNp+qMfViu/N Kisg== 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 u19-20020a170906109300b00878b89075c6si16727734eju.738.2023.01.30.15.45.49; Mon, 30 Jan 2023 15:45:49 -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 0ACA768BE0E; Tue, 31 Jan 2023 01:45:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F044A68BE01 for ; Tue, 31 Jan 2023 01:45:30 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 2BA79FF805 for ; Mon, 30 Jan 2023 23:45:29 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 31 Jan 2023 00:45:26 +0100 Message-Id: <20230130234527.13149-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230130234527.13149-1-michael@niedermayer.cc> References: <20230130234527.13149-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avformat/lafdec: Check if all data was read 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: mjOXgD7BJc2Y Fixes: OOM Fixes: 54572/clusterfuzz-testcase-minimized-ffmpeg_dem_LAF_fuzzer-4974038870523904 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/lafdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/lafdec.c b/libavformat/lafdec.c index d02b479c4d..b78ec3649c 100644 --- a/libavformat/lafdec.c +++ b/libavformat/lafdec.c @@ -208,6 +208,8 @@ again: ret = avio_read(pb, s->data, st_count * st->codecpar->sample_rate * bpp); if (ret < 0) return ret; + if (ret != st_count * st->codecpar->sample_rate * bpp) + return AVERROR_INVALIDDATA; } st = ctx->streams[s->index]; From patchwork Mon Jan 30 23:45:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40185 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp3799566pzj; Mon, 30 Jan 2023 15:45:58 -0800 (PST) X-Google-Smtp-Source: AK7set+L7kXnNqVfwtDOD3lOBfJW+g7LXBu4XPLTcUUUpb99ZN63/9USLcSmYKaUwg2/01jiuVqN X-Received: by 2002:a17:906:4dc7:b0:882:7e27:ea6d with SMTP id f7-20020a1709064dc700b008827e27ea6dmr13317812ejw.27.1675122358064; Mon, 30 Jan 2023 15:45:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675122358; cv=none; d=google.com; s=arc-20160816; b=OyjQIlLL3/ddp4Fi1fxIfkf+gcHoV/EVro+a+Ue5huUFFtJdvIMMDHnWpbh/zfiSqz gS/rRGDD/vgio2Ae244Q0HpCGrDnq7W2TRq545tDIVq0Wn4QtYM8scgkGcjaPe8Kw23m 3DI9eZDCAW3VUk9j5lCIq3fkNER+YK/8ir44cRyqQ3/9aNlXvC4hSDAr6FIfVf0WGc6x Tabpgv3MtoOk82btmJQNaZWRoTpMaBbsI4TCQO0hPxvLLUpSfNGTE5b9DMixaGrPkwf/ Z+FcHGgt4zxhsMZ5VT+XEHFboN2AVKxuvHbDDeHvuX7b/EKAv/pVwvWXreasWNuzZojJ vP9w== 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=LyIqDSofZw9ToI1hXKHYqv5BKK5cUeLxR0LEDfEiYDc=; b=lyTXPdhjiSJmWlbBIRy0ieqxKQuvN1grfxy4kJUptgygOBPoNp8Vs0PvJN2o4xI1I7 e+qhhyLxtlNWBKMZIxBz8+QJMBt/vl5CgD5WBCWdli1RWw6POfY/QUNAlpDFlm6ddsjG SixVpIXNGiKOhYTOA3kkjFrA3ARXQJ/fbUDnuPIxPnhR1TqDMqrKSqhO34YM+IDjDuwg Y1z7MgQWZU8PPmXy0dS1kHCBiU0qOR+UGYbidxstgL1oQlPx/e8NLk5JgKO8e2A5kNBq t0zOvys/xDSUsv5j0wQLsENydCoXbxCHtiHZ6+JqPLCttEDL2WGv4ccpZRN41PqODxLw MdIA== 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 11-20020a170906010b00b00888fddc4eb9si4561003eje.676.2023.01.30.15.45.57; Mon, 30 Jan 2023 15:45:58 -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 478DF68BE11; Tue, 31 Jan 2023 01:45:40 +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 01F5668BE0B for ; Tue, 31 Jan 2023 01:45:31 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 27A1C60002 for ; Mon, 30 Jan 2023 23:45:30 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 31 Jan 2023 00:45:27 +0100 Message-Id: <20230130234527.13149-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230130234527.13149-1-michael@niedermayer.cc> References: <20230130234527.13149-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] libavformat/lafdec: free data 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: kmk/GUKqH1J3 Fixes: memleak Signed-off-by: Michael Niedermayer --- libavformat/lafdec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavformat/lafdec.c b/libavformat/lafdec.c index b78ec3649c..f6d2d5f235 100644 --- a/libavformat/lafdec.c +++ b/libavformat/lafdec.c @@ -253,6 +253,15 @@ again: return 0; } +static int laf_read_close(AVFormatContext *ctx) +{ + LAFContext *s = ctx->priv_data; + + av_freep(&s->data); + + return 0; +} + static int laf_read_seek(AVFormatContext *ctx, int stream_index, int64_t timestamp, int flags) { @@ -270,6 +279,7 @@ const AVInputFormat ff_laf_demuxer = { .read_probe = laf_probe, .read_header = laf_read_header, .read_packet = laf_read_packet, + .read_close = laf_read_close, .read_seek = laf_read_seek, .extensions = "laf", .flags = AVFMT_GENERIC_INDEX,