From patchwork Sat Dec 16 12:16:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45178 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp6265482pzf; Sat, 16 Dec 2023 04:16:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IEhJ+SopAXV8Z+35tQbSlrVbvlPFvY/UZuAZ7/jQU4SKvttBWzxUq6kLWE8z16HdwkH3WFg X-Received: by 2002:a17:907:c705:b0:9cf:7c60:47b9 with SMTP id ty5-20020a170907c70500b009cf7c6047b9mr13946415ejc.1.1702728993374; Sat, 16 Dec 2023 04:16:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702728993; cv=none; d=google.com; s=arc-20160816; b=zoxUvMI8cMf05M+BbVjcvQKKrci3hfuMLng9038Fa4Tf3MFBO0fpoQ4GxmMBzD8lpv 9MKMfPXoCTQffZ1UHo/tqESr6DVDbLZNjiz54BVuelkNDte5JO95c2OjruCARkUc8beF GSYHZNk6bedjUAvKtVO2O8un8wyM0a/e9+5i7jyf2ckWf1stl/lWgi4SuBwUvaynqEIL Za8e0iYb7uM1qHpSBz5WRcVrRnWaSclJ2M6KvNCnZBs8QFMq42Ed/9u7u1TOgW/prvbH z+ETgJ249t0CMqcISB46az7YsIaObU2jp6PfXLd0pUJNt6R6n3d7Yf0A7+4B51hlmJ6c /yiQ== 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:dkim-signature :delivered-to; bh=dUTEuDK8Zlis9HfKM0ZRm4lfB8bdxEh4ZrGfe45WWuA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=LPw1aS9/2nZq9maq9qpdYP29l/ygaVbv5A8RUe+WV04FWGYU6JtDH62lgjcnEeJWSx MyO8Z6oVVvffjjiOVG15veXZ8dMjjIuHCURThaa5V1y/2q8EWuaSLo2+8JCVccLiSpS5 UeO2EwKHKc77X8qZejiVsIpKmWEUWv7C2484vVi1+47LHhWaGZT2P+Dgif9iWODMju5y +p/GMMlGFkO+n9gwxOI8IetWRR06ICQmVvFALurRpeXwSfPHcySrEUdP7tJkuElvW+NJ f2aHjChZGwgO4/xt1aIsuE39REwyZK7+n6ni1oGrVc9Im2q04EarUPrTNxOuCHkoaPBJ 3lOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=LlsHBz10; 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 s10-20020a1709060c0a00b00a2333033df6si88128ejf.528.2023.12.16.04.16.32; Sat, 16 Dec 2023 04:16:33 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=LlsHBz10; 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 1EA5668D0B0; Sat, 16 Dec 2023 14:16:28 +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 82A1E68D025 for ; Sat, 16 Dec 2023 14:16:21 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 420B61BF204 for ; Sat, 16 Dec 2023 12:16:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1702728980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Y/Wb1F5HQAvZMptHrgZ+4OQOBPmdh9dSZJpznacEoAs=; b=LlsHBz10db9/VyqjZ0CBGZRrcnfACZxXltZP2Nww0htzzrQ2WTL7PMrwUMisVZb/OdUNLu IqL/EDziMT+yFvYEMi0pc3kq/m/4pE+uhKNihZSqjrsnByd8TZUvyzs6+HUBRjACsYg+Oc ZobZDazZZ8J/9nqcuPpE0sajMuPUfOijwvIF2d+05nlZq9C1wVRp7hlx6FUGjT8+0Oh5SJ 5UbcJ47JOAOtYpEY0RfAGg/YynLUgjFAF5R6TlQ7BIqe6RF4wpdK9ffNlDGh/vinGahmFR dvP+cZH4Og3kdPIinh44D8sr9xU4IgTJlIYko3ozpnPsX209FIQiYdN8ZtXJaw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 16 Dec 2023 13:16:16 +0100 Message-Id: <20231216121619.19436-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/4] tools/target_dec_fuzzer: Adjust Threshold for VP6A 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: 7P8GmMAnfC0H Fixes: Timeout Fixes: 64220/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP6A_fuzzer-5653856213925888 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 e59db6697df..84b646b7f45 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -304,6 +304,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_VP4: maxpixels /= 4096; break; case AV_CODEC_ID_VP5: maxpixels /= 256; break; case AV_CODEC_ID_VP6F: maxpixels /= 4096; break; + case AV_CODEC_ID_VP6A: maxpixels /= 4096; break; case AV_CODEC_ID_VP7: maxpixels /= 256; break; case AV_CODEC_ID_VP9: maxpixels /= 4096; break; case AV_CODEC_ID_WAVPACK: maxsamples /= 1024; break; From patchwork Sat Dec 16 12:16:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45179 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp6265565pzf; Sat, 16 Dec 2023 04:16:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHMVXrfa2KEoHgJKEHmxkBzYS/CWXqzGu86x2PdGY1xnhJDmh0eGuo/ePr5odmK4+wXTFMz X-Received: by 2002:a50:f683:0:b0:553:d9c:ca19 with SMTP id d3-20020a50f683000000b005530d9cca19mr308512edn.82.1702729004392; Sat, 16 Dec 2023 04:16:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702729004; cv=none; d=google.com; s=arc-20160816; b=boH54m+gcsrHpAqsSKPJDsVzlD0tvDOM6UehFlXouB3DzZMqPf/YvKSQuIr75SZ+SF tuOq8NArJJf+D/Gde8HuCmqA9GTxmuFfBLeVUagV/hwepFtSGWtJnSTu3aYd2XK7y2XC oz1+xBjxff0F/1L0a1MBMmQ5mVnNXgAlacEC2mnjk5uFirtk4k1hsLkVplhzN3WBvBpt /2u8DlfE9yZHYjJrMZVhl+J2AAl5Ouq6E/F6+NOgMMe+ogSBdU1lx1TnaXHrwehkX/2f MPeBVW1HGvow9VcxFfpaeKO5Y+wTbbCEExp9f9jDep+j2RZUNqdp5aGh2Kp098RqmL/2 Q7Gg== 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:dkim-signature:delivered-to; bh=jZLNlgvYTiUIPoCZn7IbFg3fbJK2v92lN7QqThs5jCk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ygs+oA/+b2ee4qzKBzbI6ZtPxgII9QEBZIOy+3KZ6P2i1yzEoRJOsfHQD7bj57Z6xA jdLmhKYqHJGazcx5vt6tkTur1vhQ8o2Ts0pUPjTBlyO2ThHRgDjyyQUT7iR7GuVPIyCF bGpoonSE18TmKK81N0bfbufwme4ySNDfuBD8HlU+t/4H6hyZ9P9D2WihmaTIVEOJONrp khFC0zWbQrMxLf+gNIk9AqnS0Mqo/JCEqCJPHOCPSnjYRqkFdSLCsIuW8fxLK2hHK2uT 2XvxppJCM7JbsjSiAedH7Xl/1khJejZKMLPhuDQAFifKkkpbWS5xNIR75Kh6VjS88Lua 7hgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=SZ8Fuzci; 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 t14-20020a056402524e00b0054c4f3fb232si8357323edd.201.2023.12.16.04.16.43; Sat, 16 Dec 2023 04:16:44 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=SZ8Fuzci; 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 4CA8368D08D; Sat, 16 Dec 2023 14:16:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0539968D025 for ; Sat, 16 Dec 2023 14:16:21 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 2E895C0003 for ; Sat, 16 Dec 2023 12:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1702728981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=UHl+1XxYXUjVhCLuSoxmMsMJJTKPqZ+J4CjtLGusVzM=; b=SZ8FuzciW7pT+zTL17gWBnvHnSon5LlMjKN8dLRl4CY0Ien5ekY8b8qN7qAQaJJSe6W60/ QQT+qSTeko1hxqnL3BWURocdoRsMPljkYXii15nub4zsI6rspC/P80mLpsNGS0228uxsqu UQmjhbu2uGqxHKbq61idSIXFLGUEs+h0iiVKKT9+rRuXs5cLPpfQYeVewhdxPFFToh2jdn G7dwPg3W8P3AQJmZCqiqTduk+g6x22Z4Hm+bcFEAnysu+VaprK+npdiuuPfnK7LEBJgKPz jNNjP3jS+n7dmRdibpu7K7DVLOOEWA02aseo3OVDYe0wFIPFtXbJLIqCMn5TOw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 16 Dec 2023 13:16:17 +0100 Message-Id: <20231216121619.19436-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231216121619.19436-1-michael@niedermayer.cc> References: <20231216121619.19436-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/cbs_vp8: Do not use assert to check for end 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: TAuWiFyWbAAb Fixes: abort() Fixes: 64232/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5417957987319808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cbs_vp8.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/cbs_vp8.c b/libavcodec/cbs_vp8.c index 01d4b9cefef..b76cde98517 100644 --- a/libavcodec/cbs_vp8.c +++ b/libavcodec/cbs_vp8.c @@ -329,7 +329,9 @@ static int cbs_vp8_read_unit(CodedBitstreamContext *ctx, pos = get_bits_count(&gbc); pos /= 8; - av_assert0(pos <= unit->data_size); + + if (pos > unit->data_size) + return AVERROR_INVALIDDATA; frame->data_ref = av_buffer_ref(unit->data_ref); if (!frame->data_ref) From patchwork Sat Dec 16 12:16:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45180 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp6265628pzf; Sat, 16 Dec 2023 04:16:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IGu6kbmWP0lHxwCo/SUaLc8YeYMgW+Cl/a+p091NiqOePHGfOitqI86HDQa+csUGwK2gG3R X-Received: by 2002:a50:d71b:0:b0:551:8349:c1c with SMTP id t27-20020a50d71b000000b0055183490c1cmr5225033edi.74.1702729012783; Sat, 16 Dec 2023 04:16:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702729012; cv=none; d=google.com; s=arc-20160816; b=qfIL4y1kDPy3ph8kxkHMVaEICEPXOIgyEzICz4vrddVKmEwmmiNONBy09tlHgtCRUR XcDjEHaNlSofj62ppKZm1QtbBgDWO8a4087JEdk//RYaFu5F6QZ2LIb+nXF3UePhi9dF G/U751a/xZ5ER8cME9LxHn649UbWEvjh8ZYL+fyurq3iDPqglY3JaPRP6xY1Oakg94pz fCie3GQ1G5MQXOEKz8iug/6VLfOzB3JWvPU8txtST5x7dv71KC0pcsi+QzyAgj8ZbvS7 0q4ygDXFx/YF92Oq7fELLpk5/VamhcOxfM2JOOwfL4QGaR+5OrtSJyF69W1of7IIL8gD s6Ug== 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:dkim-signature:delivered-to; bh=aPrwF4C1VGAh+zG1WEqznLpGwy2tbOnK9Xbgf4rweQo=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=a+YyYvzBLkHqlpThk4SFQcbHSzrbpHohGSeYZXthJef/9oUYARx2R35z1UsijsCRPM /7XvssfTuRLqFmba5NVSI3e6d40yyEVQpedOHugsMO/zDzFkkNBXa62iaq0/DVUJPs/k RDA+nkAkcQ3hxQYF7bSUuWEjVBuS7mbL8nfPFfZpOoxKNrzFlkyWTyWGNpUrdD4fklV2 eYaCT5nKRGqCtQSZwLtttK4lr1HRvstEdrfvQ4kVkRGJliXjLoGDu8Xd5j2+DJ5hcm9u l6T7GYv8svm69iYv+6fgInUXAYRmKQmDrIBCAhDA00kAaByNe3CkHn8V9JV2wA50fatr ODmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=NMzzgRwg; 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 ck26-20020a0564021c1a00b0055307e61a66si335685edb.39.2023.12.16.04.16.52; Sat, 16 Dec 2023 04:16:52 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=NMzzgRwg; 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 5FE4A68D0C8; Sat, 16 Dec 2023 14:16:30 +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 DA8FE68D093 for ; Sat, 16 Dec 2023 14:16:22 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 09C64FF803 for ; Sat, 16 Dec 2023 12:16:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1702728982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=wicC0ry7NYdcB0IHLT+7nENP2uR8yQ+tWSZClQcIQNE=; b=NMzzgRwg/MpxxNn58+pG+95i6W/v46mFoIViTTHtkJxSOwJE3n7EO5Di/hzHvw/tpKgI+A jGFeJgjCTpPgbzhqsDJY+SWipkoQngcD0fwrQE2K94zOS+CwasnZeInSwY0sF7+zMiKvUd lZHCoFLir+/6OQftUcCOu8dL0HGDI1aOWOhD21LxV0k0xnh6S3W5F4+f5cye422gLZFXAk UCcQJU5fr2opb2VnVXalmLHe3rbTtsZh/O9470Bkgp3FNSQzmuQT8ICfjqml3YzvyL1ie9 8Oh9rqUHsNQK1na2GhaS1rHE4nMzIjjXiGO3zGoC9WrOMWhhINxdRO05j968Qg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 16 Dec 2023 13:16:18 +0100 Message-Id: <20231216121619.19436-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231216121619.19436-1-michael@niedermayer.cc> References: <20231216121619.19436-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/jpeglsdec: Check Jpeg-LS LSE 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: n9kaC/WE+EiN Fixes: signed integer overflow: 2147478526 + 33924 cannot be represented in type 'int' Fixes: shift exponent 32 is too large for 32-bit type 'unsigned int' Fixes: 64243/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-5195717848989696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeglsdec.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index ec163b8964d..c245cf0279c 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -382,6 +382,19 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, state->T3 = s->t3; state->reset = s->reset; ff_jpegls_reset_coding_parameters(state, 0); + + /* Testing parameters here, we cannot test in LSE or SOF because + * these interdepend and are allowed in either order + */ + if (state->maxval >= (1<bpp) || + state->T1 > state->T2 || + state->T2 > state->T3 || + state->T3 > state->maxval || + state->reset > FFMAX(255, state->maxval)) { + ret = AVERROR_INVALIDDATA; + goto end; + } + ff_jpegls_init_state(state); if (s->bits <= 8) From patchwork Sat Dec 16 12:16:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45181 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp6265675pzf; Sat, 16 Dec 2023 04:17:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IGMAU5aRrFD/SaSh8HR3r6tLd7lRUGEC2SqQByqGIt/vCCeNz2NpQWp7JZi8uJQdF3Y1YU5 X-Received: by 2002:a17:907:a090:b0:a1b:7f8a:7c97 with SMTP id hu16-20020a170907a09000b00a1b7f8a7c97mr5108039ejc.77.1702729021115; Sat, 16 Dec 2023 04:17:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702729021; cv=none; d=google.com; s=arc-20160816; b=I0W1d8C3lvLPRQrsL3LmO9oDA2LGj9KCNsyR8OpBMmFA4+plS+GKyVf2GNnsW7gmcQ IFMXFDJosHQgW8v4dN5Kt9bbAuESQYiqC00b4cHhIqdnP4R0QKOAQZ+YZv6ARHDTaWzp NJtTIt9cb4fNnt7pfX50A1M9v4bF8VFoXc15rABijMjMQAE067jFGWqkKGaNA6wlgHsy kMykdTHFv+Ra9wa66yBO3Hjg1XYp+Q1j7tfi7e/K4gD5oaniF1Zx9v2W6yExFTEHk9Bg Qy5jBlQZbhFH7VCzPs8+Y6EsXonl0aqz3tOoA9OSE4sMJ9942cN7fEWOBcSueliPcFRz 62tQ== 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:dkim-signature:delivered-to; bh=faBmnGx360U4JoYMmUTgVejtUFMaUL5un+TtJyaMRbU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=hBd7QQwy8SfrVNXeJ8ATGoPl6CE0quyMsIU2xJqOaivc/gAIvXHcuwJA/AzpWMomX3 GhC/+1WVH+/JMxBS7WJl9N1ubBnEDmBt0u6o1U7zezrCzBmRCPeytssUHZ0iLdFRBeSd tE+pfTuGNc/IgnlfcJd4IWvxbiKt17/bCvYt+0nUS1Mq4EKoimmvLjguR3nWET2SsXyr H7QiJDGLmsLQtLqFPhh/T8hgHbx2Cp+95Wk3J2tjk3WsGbJ+pLBBR/pP5mEgwbAMvvE9 Sq7+VjGAOx+bC2W34jybfZCLCnf1wviefr57Bz52tkK1+iv8esSt5h6vQYKYqKTq6U60 iGkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=BiOt4tNr; 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 hy2-20020a1709068a6200b00a231bd77713si1228904ejc.580.2023.12.16.04.17.00; Sat, 16 Dec 2023 04:17:01 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=BiOt4tNr; 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 7344668D123; Sat, 16 Dec 2023 14:16:31 +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 A634468D08A for ; Sat, 16 Dec 2023 14:16:23 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id DEB9360008 for ; Sat, 16 Dec 2023 12:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1702728983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=hqc0SoRe/ogCdZHwL3TZgQcx71ZKFOu64OJdPgbAW88=; b=BiOt4tNrQ54iXAD+ObhB/pVubvj2ZMwbPzh+5zXs0c2N/1WoM8mFCSODFz/gaT/kdxYtQW OnHpTtXNYKpASErc9PmgAoJpIKqwRih1otZhP+XTyciXkOiA2YXc/URzyGFaVW6mmJjhcs fyxJQkpoNrp3WGFrhQQDvq1+MgS72+JXgn9QwwkqVIxnoSn/5S6FXZiCg1JTja8Ye3mHOw zhiPYSU8AG8cuqLc+1B6L89QP5oIZPQlu7qUrNboZPGlo5MP6QFEAXqQCrgGGppxgFogA2 9iiwU0tfPba4dH/VSnmh6dAoK37zk1FNoxGEw82P3gjxZwerchudEWxGT68D/A== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 16 Dec 2023 13:16:19 +0100 Message-Id: <20231216121619.19436-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231216121619.19436-1-michael@niedermayer.cc> References: <20231216121619.19436-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/4] avformat/mov: do not set sign bit for chunk_offsets 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: 0VEz8roP4Xwk Fixes: signed integer overflow: 2314885530818453536 - -7412889664301817824 cannot be represented in type 'long' Fixes: 64296/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6304027146846208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 30cf7a15b01..65c5c8c288c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2242,8 +2242,13 @@ static int mov_read_stco(MOVContext *c, AVIOContext *pb, MOVAtom atom) for (i = 0; i < entries && !pb->eof_reached; i++) sc->chunk_offsets[i] = avio_rb32(pb); else if (atom.type == MKTAG('c','o','6','4')) - for (i = 0; i < entries && !pb->eof_reached; i++) + for (i = 0; i < entries && !pb->eof_reached; i++) { sc->chunk_offsets[i] = avio_rb64(pb); + if (sc->chunk_offsets[i] < 0) { + av_log(c->fc, AV_LOG_WARNING, "Impossible chunk_offset\n"); + sc->chunk_offsets[i] = 0; + } + } else return AVERROR_INVALIDDATA;