From patchwork Sun Mar 20 23:30:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34874 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1219082nkc; Sun, 20 Mar 2022 16:32:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0WnHmfGXSiFRv8fA3xBJZ10FHu9WUGtqFHMwxnsdlI2oNbdRYgIYkkc0aE8P9Clc1UEc1 X-Received: by 2002:a17:906:2695:b0:6ce:f9c:b476 with SMTP id t21-20020a170906269500b006ce0f9cb476mr18531271ejc.235.1647819136729; Sun, 20 Mar 2022 16:32:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647819136; cv=none; d=google.com; s=arc-20160816; b=dgf4LqkdxnVQcrsjYonmQ/HBmshafNGrlVc49cKgIz1WfFtdQi5fEfTRG1eHNa/KqI g2lHgz/EJVmxsqIgTWFoFLqUdmR7s3bcaxT5NrC6T21gjAStSXSQI+uZXLma7uQIy9ef s7Zew5m4nR8UWtjeq/oYdIXlcPzQx50PqX9EoidV36OzPrmLHaVSbt3OJZYPsIyNrUqU 863TPFWOFgjEQJOfiNYkk7pEuPpDyAi4VOHvLvt9XGlJf+74XcjWzxCmzZZ5widTXzoD G7E/914/q7QcvfebLrYL3omLR1fcYAynzLngzVNKMv7UfaQuPRHQ5iSrNYjelBLQjs9N P/8Q== 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=y0XasZNmUP+95WaEBYbhcla2GkvHypy/LWTg/zZa8Vo=; b=bLl5DOw75uqgkOSqJLCGEYckWVdmvehUEslseh/K6gyo6yTlmMxO8wPHY1ic1aRi22 1PGQgveaPmKdpMa1O/ZL4ykPG/HJkqMaUJUem1m7mf/OfU6QjqOLV6jFSFL64NrbIYf9 PhTnOvdXgA3HV9EoZTCJKQVrkzK1d99ZDcDfnqX+gcFXx7xl2i3U/NVzO8WIR7IVd9qg iw162jOcbV9nBbsAYw2RfOFE5YdjJr6ILXvT0eLoqIG3e+YKQdy2E1tSZKg/A5j0S1U6 SDjkvIxRouBLdIjuF5YflQfg9dq7DTrSSiKcXpdrYu7LjwS04RQw4GoDKp4iC3n9fNPb d2bw== 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 q5-20020a50cc85000000b00418c2b5bf2esi8964660edi.528.2022.03.20.16.32.16; Sun, 20 Mar 2022 16:32:16 -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 59E6368B180; Mon, 21 Mar 2022 01:32:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC90C68B14F for ; Mon, 21 Mar 2022 01:32:12 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nW51w-00FjuP-0L for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 00:32:12 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id W4wrnGGxXSgGFW50ynIvZ8; Mon, 21 Mar 2022 00:31:12 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id W50jnPQXUOPqFW50jnIvAz; Mon, 21 Mar 2022 00:30:57 +0100 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=OcX7sjfY c=1 sm=1 tr=0 ts=6237b93f a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=IUFDKc1Ko4O-RTg0YHEA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 00:30:55 +0100 Message-Id: <20220320233056.18169-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320233056.18169-1-michael@niedermayer.cc> References: <20220320233056.18169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDQdwTMeYboiCfH13ug4Is+sldLtNyLIZqT1hmg90JuhHN8qokINYH4JUWlgdlPzXhcF8bb5sjVBOGkuH6DUhsaowLQOXT819IgUGnsGGPU8SfX7PuRd T+VNddJEB4jug5cxVQCwj0F5B8pBVIJRtJaSA7USfqzvOOtyb06Ahfq8o2HKJRm34Cu9gKwqmEsQ8g== Subject: [FFmpeg-devel] [PATCH 4/5] avformat/bfi: Check offsets better 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: Lv4qriCJAFxI Fixes: signed integer overflow: -2145378272 - 538976288 cannot be represented in type 'int' Fixes: 45690/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5015496544616448 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/bfi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/bfi.c b/libavformat/bfi.c index a42b78b8c0..dcbe21dcae 100644 --- a/libavformat/bfi.c +++ b/libavformat/bfi.c @@ -139,12 +139,12 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt) audio_offset = avio_rl32(pb); avio_rl32(pb); video_offset = avio_rl32(pb); - audio_size = video_offset - audio_offset; - bfi->video_size = chunk_size - video_offset; - if (audio_size < 0 || bfi->video_size < 0) { + if (audio_offset < 0 || video_offset < audio_offset || chunk_size < video_offset) { av_log(s, AV_LOG_ERROR, "Invalid audio/video offsets or chunk size\n"); return AVERROR_INVALIDDATA; } + audio_size = video_offset - audio_offset; + bfi->video_size = chunk_size - video_offset; //Tossing an audio packet at the audio decoder. ret = av_get_packet(pb, pkt, audio_size);