From patchwork Wed Mar 20 02:59:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47263 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8ba5:b0:1a3:31a3:7958 with SMTP id m37csp133172pzh; Tue, 19 Mar 2024 20:00:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVstKcXITVlgW82RNLQp21YSN0bWPTBIxS7r8P90loKXABlGEYhkfSP6kSMpC3Nisvgrlpj7HX5WRU/uAVJXYNWsk0Ln88762d2sw== X-Google-Smtp-Source: AGHT+IGYb2WwEhZPwmSJ/l+ObiFzUQFGH8I2e1QDty3z2P+9z++ry/4kGfTX4S6976NIWJSGBrby X-Received: by 2002:a17:906:fb13:b0:a46:ebe6:742e with SMTP id lz19-20020a170906fb1300b00a46ebe6742emr1069732ejb.23.1710903605648; Tue, 19 Mar 2024 20:00:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710903605; cv=none; d=google.com; s=arc-20160816; b=S0aDFc0E82G82qWVNz6vh6139+TZY2tcGAn+kQmP7Z+f/KfKVAryqMKB2etqtupMD0 eNCepE/QdoppJ81NiCphTJhiFU6Q7121V6k13QiwH99CtvqbQldO/Y5Oayy3uRPC8bIa D7xcMrIUP+OeEsZU+R7ED4lDeu/z8UAzmhLYqtbGL1rdWLYlXRRnxoPss08Bbwqa3AEm DxMccDKn8KNdCk/wvd5caADk8uaP7TEN8PUXiB2dJCUZXq8wvvzOMM5awJU7uscc7e6x ToAsGFbClFqJbESoFmPyMgUwvI1AzncBZ7buOJ8KMRT+HF7fhSV4JivBPdI8nxyafoDd q2AA== 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=ql3MlP8+ZIKq8kqamtgUNH+fWQvsMJkY+PenO65aP6o=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=0SfK/3Pxrk/obbg5taI5eF+kf7CmY3Zi+ku8wGtqHZhh9ipcrzhrkBhQbfKnDR+K8m 0al22nOM0ECSmKcQOdfPwC+4eGmqUu4VQlqrxTmv+p64RwjkEwlWDJ+2m2I4qhhMgHZO ge1ONM5hNpFi1CdXs+dp9qHFsrKzk+Kj2Pgg7AJO9HHFO/EUiAkt7aQVlF5jFcTNXPv4 D5YtmNrzPqsVpVuunGPWhnlfLDsHxhZ8pPPj/fKia9d4LWawnBjEGDDip/b/+AWqTfHS p/OMNJ2n4V28fdTi5XpSeymzOz0xaowYC+UEQmMf/VDK15xHO++wmZaIENSV6Fwob/9n jb8g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=Glhiqu6y; 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 x12-20020a1709064a8c00b00a46cf8d3a31si1787860eju.435.2024.03.19.20.00.05; Tue, 19 Mar 2024 20:00:05 -0700 (PDT) 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=Glhiqu6y; 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 8BCAF68CBED; Wed, 20 Mar 2024 04:59:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 554A468D307 for ; Wed, 20 Mar 2024 04:59:27 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id AFBE640003 for ; Wed, 20 Mar 2024 02:59:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1710903566; 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=I3tqxwvtZWWVYJbixrp5KTKMbrK5v2xlLskppo/Vn84=; b=Glhiqu6yRvJSfQnqPNv0t1iaUp9Ay/M9VcCx17rQlALZ/XOtHCl36aaC3h3FQ6m8gDgcq7 RBN28SP4a6sGAn+A8V476D50lHkknLL2EGLZ0XePuEzVyiBnoiPvBVK1SIZIGI41DeNJJm /XQAzZvIw+8ukasZgFPSXLoEhbC9qIpm9YgS0ugOgS6ArPvK8KU0t80lohrXB25jESZ6Ke cHH3M0UmrUncfiVHNuOeKOxLojQNPCe8z5uLUSC6bwArXHUJuqdBv7Xzwe/paNL+m8lpqY 0ST+5RdMRV+cuBCsBQkFeKvgRul0HrLamAs9YtDTFbx80V1vK3QolP76uQSQ4Q== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 20 Mar 2024 03:59:23 +0100 Message-Id: <20240320025923.3794-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240320025923.3794-1-michael@niedermayer.cc> References: <20240320025923.3794-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/4] avformat/id3v2: read_uslt() check for the amount 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: nRgDihXorjW+ Fixes: timeout Fixes: 66783/clusterfuzz-testcase-minimized-ffmpeg_dem_GENH_fuzzer-5356884892647424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/id3v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index d83716dcf4..e0a7e3f3ea 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -370,7 +370,7 @@ static void read_uslt(AVFormatContext *s, AVIOContext *pb, int taglen, int encoding; int ok = 0; - if (taglen < 1) + if (taglen < 4) goto error; encoding = avio_r8(pb);