From patchwork Sat Sep 17 14:32:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37984 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:906:7090:b0:72f:941b:de8 with SMTP id b16csp266258ejk; Sat, 17 Sep 2022 07:32:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM59oNmBFyGR9vsCo+OLHgOCnGDi2gtrTRlqZU601s4ecqCUzf5hklCY1IfrbRdbmXVSRPAq X-Received: by 2002:a05:6402:10cc:b0:446:491f:d6dd with SMTP id p12-20020a05640210cc00b00446491fd6ddmr8023508edu.360.1663425167591; Sat, 17 Sep 2022 07:32:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663425167; cv=none; d=google.com; s=arc-20160816; b=wEA/pYTlE+R/fJ+YEZ1w3ItOWsAlgBZQwVog2NtAzCGX4XIbj6zw9tLqhrNRLmSpLv i4YVrJSGEBQnmS9Ryra4tZTbYVkiMAb4RuVlQlH+NIHwYMIAnSYHpSIbi0O57y7kxccW Y1aFtpzALeIYQ3/fYK+QLENR7vs7sRdjaCUYWmUloMC3T+AEKp6Fn8t1t+JitSNuJbPv /b5Q13jyKRYlRTIiHmPZOTFOBxRGOAktgjDWG8WnqQ0Ty+m8/e4lzrm/qc3ZdSHWy3ln rotG2FwkhR7Cgmizm3bQJ2qbuIYRA+dMExv94PIpC2i1g/vehWiIi1i0Mfnh2EeMpvle JBBw== 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=Vgj4o8pjtpWxdvaS57Md/C5mfX9bzV9dGidbxIwxR9A=; b=g8K1emnmRmhGVOueuwaNTJNn7dtyH8Obh7HP0uN+WssEwXU4eV4+ai8tQY0V1jW80r z1dHdX7gT5g0BuXOAsGJ+21Y7M5jiQYWU7zZ9D60y4ntI37DSndRLH5+PSEPGeBwv9YU McWL43VSdhTnBiVcRkq4xE/xV9T7X/QOVbr9ffdC43YNb7iQDAYF0mB5aAogDOS++p/j tw6g0IsH4xhgFbolcsaM4eU7D4laO3P5DbjPckOiQagayvG+7rAgg0wgWn+aeKCBpwMK zjsdaC03MhONExMLuOuqbcfMe88mr2VOGTHWsx0fvt16WkrqFSh0hZCZW+hXExIF8fn/ Ndgw== 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 jg29-20020a170907971d00b0077bab1f707esi17495263ejc.159.2022.09.17.07.32.22; Sat, 17 Sep 2022 07:32:47 -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; 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 2806068BB04; Sat, 17 Sep 2022 17:32:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (unknown [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 576E068BB06 for ; Sat, 17 Sep 2022 17:32:12 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oZYrb-00DX00-8s for ffmpeg-devel@ffmpeg.org; Sat, 17 Sep 2022 16:32:11 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZYraoHxwm8s8UZYraoEB1d; Sat, 17 Sep 2022 16:32:11 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id ZYraow3ahbZLDZYraoHwao; Sat, 17 Sep 2022 16:32:10 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=6325da6a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=NZNCtQD6c9wZftA5qAIA:9 a=zWt-qT5HLs-Z4RBIDahQ:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Sep 2022 16:32:08 +0200 Message-Id: <20220917143209.7797-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfKwfr6W+YeTxt3JwFGWEQbzCegaC/pedP8vo2chcrI33qSaYnAxCHNdRwEHRP0GrRuVlMq4i/rYrdXZRloJUwXgfjPWqq0xDKpbsAinmOzYZSKnla5oZ 6+oZodFC6ixIoLOqTjgPaI0cFx0Lo7260m1ykxdOGaZYGgORjpCVX+CgyvmFOxvXQwvJz/RilaIwlA== Subject: [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: Check block_duration 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: 8YeByekLTaYa Fixes: signed integer overflow: 3 * -2147483648 cannot be represented in type 'int' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6668935979728896 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 0487d3f0299..318e3ad742e 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -372,6 +372,8 @@ got_sound: av_log(s, AV_LOG_ERROR, "could not find COMM tag or invalid block_align value\n"); return AVERROR_INVALIDDATA; } + if (aiff->block_duration < 0) + return AVERROR_INVALIDDATA; /* Now positioned, get the sound data start and end */ avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); From patchwork Sat Sep 17 14:32:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37985 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:906:7090:b0:72f:941b:de8 with SMTP id b16csp266453ejk; Sat, 17 Sep 2022 07:33:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6V+ehKSZo96Se4XHFMj8JKUXhebCj7/XVZFm//bvbQFa0bs6CZSl1M31UYxygcAmMoQ+Cp X-Received: by 2002:a17:907:80d:b0:73d:1e3f:3d83 with SMTP id wv13-20020a170907080d00b0073d1e3f3d83mr6767955ejb.372.1663425201474; Sat, 17 Sep 2022 07:33:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663425201; cv=none; d=google.com; s=arc-20160816; b=hwuOwGw8k8FbWcnxuAclQfpMe2JmKsPhe0tE6XJJaRYonjYR/jGqw6floNVXSJC22B 3XH3s7jWMdSZEnfbaCcbsO3Wf+6UUZ6exzsCD2UGGgLuXVBAa0W7zvZ8MBMzstOzdJwv qwBX0L+PIPjaPFc5m/lyWqUUCZeNkWDl/S2yNjhUUTF1HaqIw45ZTOaYymYoW+KvdggX xJPUcL5Bz9QbHNo6s8B1sLehm5VgBMoRKuKvua7ktnaSWLVaK515MLvTLO4d4591OpH4 RMlKKx/DG1wEh4+jNJxEBTzBb39qYTYhvPzB28verNvuewwbWPcnhZZgbPIXwY4h61sd 3h3A== 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=/NlEwD0uWKKDReDpBdHzvIuTwYBWMxk5hsgPVintibs=; b=EhTw2Yk+R3s6Ab9C4YtajkBtqR7uF7HRj9JcjLOBuAj5MzDdqsD75ZGUDbxwWeGw3N bTeDXdOL48zODst/lHGuSe9hB81f5U08zWDAMMAbg0TXiJp5p9gxkrpE0VC3KWcIRdJx cd4ilm14DU6Fvobg/xKn8uMSibWGH2NLXRdAyzpgyriL+pfa316dfuq6+LkS7MJkPQFw fkcu+WYNihlGP0Ay/8JrWK0bMAAhFwFJx1wGMveUKZ+m+y+W1CGvbsVr3POxE3o9OnJw Fo7k1JV9bmRSAtvsjCQog1lqcX08EkrtPgnJo/nTyxoIRoBEtgAzL7WyKOfPiWoCBVLg E80w== 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 h22-20020a1709060f5600b00778995de77csi14804473ejj.605.2022.09.17.07.33.21; Sat, 17 Sep 2022 07:33:21 -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; 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 56D2168BB99; Sat, 17 Sep 2022 17:33:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-3.mx.upcmail.net (vie01a-dmta-at02-3.mx.upcmail.net [62.179.121.150]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51D7F68B373 for ; Sat, 17 Sep 2022 17:33:12 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oZYsZ-002kES-1U for ffmpeg-devel@ffmpeg.org; Sat, 17 Sep 2022 16:33:11 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZYsZoHz9r8s8UZYsZoEB9D; Sat, 17 Sep 2022 16:33:11 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id ZYrbow3b3bZLDZYrboHwas; Sat, 17 Sep 2022 16:32:11 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=6325da6b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=WGHPheOr9dz57BJZ-i4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Sep 2022 16:32:09 +0200 Message-Id: <20220917143209.7797-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220917143209.7797-1-michael@niedermayer.cc> References: <20220917143209.7797-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCVQcrXVLsp9xM1ZFoANGRW7hW0XYUOcdkDIpbgGqBjQouEN1ERmIAy0x2OQQOCYZFTXVv7glni2UQ2gm+yQEDz3CVUGRFR1uglvScQ8KU8IHgNAKdhm TTASHgpqHBD7DpXKR2KVvkXHMW9S9CGJxFgkTuGpKJ/KDjGxIoxnYvfjGyO67B97zac4JNb210JUUA== Subject: [FFmpeg-devel] [PATCH 2/2] avformat/aiffdec: Use 64bit for block_duration use 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: OJPOlGHMPwY/ Fixes: signed integer overflow: 3 * -2147483648 cannot be represented in type 'int' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6668935979728896 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 318e3ad742e..80733e58010 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -428,7 +428,7 @@ static int aiff_read_packet(AVFormatContext *s, pkt->flags &= ~AV_PKT_FLAG_CORRUPT; /* Only one stream in an AIFF file */ pkt->stream_index = 0; - pkt->duration = (res / st->codecpar->block_align) * aiff->block_duration; + pkt->duration = (res / st->codecpar->block_align) * (int64_t) aiff->block_duration; return 0; }