From patchwork Tue Mar 26 00:11:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47468 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp1510747pzb; Mon, 25 Mar 2024 17:12:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXicS0RSvZjfcpmLfqXYVmLrVqrWMDc4n3rE4026sidLlSxTJ7gXiqYB72etQWyGkqsith1O0g3ndnQguOxoEVdxOGS1+2f5bMplQ== X-Google-Smtp-Source: AGHT+IFdlYQWeG1Qn45jYxYZIrwDjDv2SWOATbdom6m3vpvnwag7qLa4AsmholRru9rYht0VjjW0 X-Received: by 2002:a17:906:1417:b0:a45:b1d8:200c with SMTP id p23-20020a170906141700b00a45b1d8200cmr5705151ejc.14.1711411976516; Mon, 25 Mar 2024 17:12:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711411976; cv=none; d=google.com; s=arc-20160816; b=SxFXRhdPoaxQsHq2/zgmG/avwjnV+mGtUyoON2PDWafebw0sOOJ3EK11H697b7KLLr bku4ht4/p/mQKTEXfgBBddkp1j51MetwVdmxx7FntN61Z1wucUyl8XvDuO1lXgYi3sPy cgtsRy3NxokUe1E2wgun/X8EmPemcWpmD4XH5t4ArMcIjpn+NSZotbG5z94gCKbU3ixm oz+QDe2PYE0Z5SvPWmrSaA1bP+jMUB7uVIhLPuWiT4awn4Wx/JhlSL/q2C+jdGXjxfY3 YWAktBwlOQgsC9CElbt2SyHz1dfsS4ZHzUldNIaLB134jLBcf6zgywtLCziXmZVda3E1 3Q2Q== 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=dbxBAJ0YWKFsiEm7QhQmnlZ5+8FfLND+g39v+cKn+Sc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=fxVTmlABDdDwMcTiT5mnU3YWwBG4ufh3JEU1LQmWYnI+mpEA3vfqIBo5r73ju9UXeK v6qdbYZ9lKVVOlJmOmHYRec0YX/rUVO00XqkkFacBjfaj67EHNge1k5ue7AwTLW75qZI gf5NyfRZo6VGbLWkutMdhjep83A4MO2SQvtQ/avPe5BdNSRzWcsXby4n3lGxm+iumR6C 9SyQ/vde/iILxckvNrE6X2Lb4DeR3vDVakymdOcIYaj9kHPhN5hUi1DRJt7xlkHDxTtW nwZwl5kuyTw98eEwriuwt8rAF+6RyrbUH3GqfG9TcrRYlC86hOdy/+k9w8Nvsw9Wx2uW atnw==; 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=KYgOBG88; 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 9-20020a170906308900b00a474b309881si2232089ejv.121.2024.03.25.17.12.56; Mon, 25 Mar 2024 17:12:56 -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=KYgOBG88; 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 E04E468D603; Tue, 26 Mar 2024 02:12:06 +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 CA41D68D49B for ; Tue, 26 Mar 2024 02:11:57 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 300FFC0003 for ; Tue, 26 Mar 2024 00:11:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711411917; 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=xHns4NEyDy2JMuA75iaao180N2OzEv/VCkeBgy3YDjk=; b=KYgOBG88kPFhcRZgdwKkoMVgBy/6/MPgLjvbRGhkFF8p65vXtAWgBfzu2hpbgi3zHp9PoO 78EFx/Oye+09/Xt8dl/f8U8nH21yztneH/iGKdb07S/pTRFDCRsaxuWtXb/oQIyGPNF3wx 7y3E1bIXdKW6RcFOlJ0WUGJe8yGK3BcLMWdISJIOMdwmOKovaGo18X1JIW1CJ5elgkjR7k CxZT6YfQq2VMZOI2tfmFr0/Uk6BQlDj7C74kGAVuZ5jLJzOv9ik7FzhTYJhBxey4pQtwOo otqJ1x0jW9YJjL0X9MZZ9wZCrnYZUGM3wK9EU0r6Dzem+lezWPwnHtyhtcKh7g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 26 Mar 2024 01:11:48 +0100 Message-Id: <20240326001151.12083-7-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240326001151.12083-1-michael@niedermayer.cc> References: <20240326001151.12083-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 07/10] avformat/wavdec: sanity check channels and bps before using them for block_align 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: 1t61TXfckWJX Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_W64_fuzzer-4704044498944000 Fixes: signed integer overflow: 520464 * 8224 cannot be represented in type 'int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/wavdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 668c8adc36b..89855670d9c 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -34,6 +34,7 @@ #include "libavutil/log.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" +#include "libavcodec/internal.h" #include "avformat.h" #include "avio.h" #include "avio_internal.h" @@ -908,7 +909,9 @@ static int w64_read_header(AVFormatContext *s) if (ret < 0) return ret; avio_skip(pb, FFALIGN(size, INT64_C(8)) - size); - if (st->codecpar->block_align) { + if (st->codecpar->block_align && + st->codecpar->ch_layout.nb_channels < FF_SANE_NB_CHANNELS && + st->codecpar->bits_per_coded_sample < 128) { int block_align = st->codecpar->block_align; block_align = FFMAX(block_align,