From patchwork Wed Mar 23 09:30:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34920 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp844169uaj; Wed, 23 Mar 2022 02:31:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykcqlhESAPdYVSctRx/jNU9keSFYk+r4SUq0uFQt2/EwSZXbE5Pdso2dj7xugku51oOMi7 X-Received: by 2002:a17:907:9485:b0:6db:331:591e with SMTP id dm5-20020a170907948500b006db0331591emr30384897ejc.478.1648027866968; Wed, 23 Mar 2022 02:31:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648027866; cv=none; d=google.com; s=arc-20160816; b=qn9vr3VX4ellqFBm2ITspw+BBP1xKR9k0DL4vYPAUkPxUhXZLU96UTbrm/F8Fhbtsm 6/PFLnAhbaXQaSz0Vk1B/B0/bLS1xV7ZnOhFYEUXck5/nz125BuNwHfHl4oYlO+RQWdh I2RZ+Lg9o4kq3yleAJPPBRgLmoDvD/fMQXajFJ2xBgrtWikERCcIphVZnC2wep5yxpLt JSvRbFWD7ttHXSucPmRTzAW32j9eQ1B9Vr2Q1Xc14XY2d39LxQYkedWwBNhtqYCB48yV v+LsYu/y/vdJojTgnvs/uZlRtDmNAJIJ4AJjlcwX43p6A47YqVgnnXUr5RbBnNyNATWH 8kJQ== 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=KAFuTC6XSOanzw3278/bFJ10EDgQSbwBVK4avDxxZ6I=; b=RKUptJbySfK37oxD1khzevX97e1YHAhiaKnENZe7GAvybSfJveYNXOkLThf3TAGG6J 3hyz8qd3fm6ta5R+ibTA7gTqXI3hCinr/tlI3N/hd8Od3NrJrdbovsA4E8HHEEWdWJ9o vaHZM3KLV3wNLthmWGFu6Dk5jyp+x9Wrd7vjz8M8e5uTyc+Z74m2wfOpommGgEb37QWl Rcf15RJAx8ueKcgOj7ClqLsWTtBK/mM+8gqj1dPXlG3jHOXitVg2iHAXlmNuBNzxuA6e cHO+Tbhl21bSn5prEtotjtlQoAlJxqVyfW8zuezt41RJWzZNt9JpgTE9tKWqL10IXtA0 SwBg== 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 s1-20020a50ab01000000b0041947932452si7049193edc.439.2022.03.23.02.31.06; Wed, 23 Mar 2022 02:31:06 -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 4FB8068B13D; Wed, 23 Mar 2022 11:31:02 +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 9637268AB32 for ; Wed, 23 Mar 2022 11:30:55 +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 1nWxKO-0018q6-GD for ffmpeg-devel@ffmpeg.org; Wed, 23 Mar 2022 10:30:52 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id WwvXnU7gNSgGFWxKLnRFmA; Wed, 23 Mar 2022 10:30:50 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id WxK5npMuOOPqFWxK5nLAk9; Wed, 23 Mar 2022 10:30:33 +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=623ae8c9 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=3JgvYCWpzyUfzx0xanMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 23 Mar 2022 10:30:32 +0100 Message-Id: <20220323093033.24577-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfNSRcuRylL5CwqrwE9Yqvje5E78282fjVKTvnrgPQNCUhMWc97E6zQtlsslz7gw2E9LVrDgEei8Axy8KXggc+lcrigCR5D3+WO7jEJXP9O+8lVP9gsb7 sNUM7pZfnpRTrx4TCk9Rg0CdPJog62CXpaRpK/nVB1RAMG384K7TpK23CXVS742b8Rp3Fd8+zfkTew== Subject: [FFmpeg-devel] [PATCH 1/2] avformat/aaxdec: Check for overlaping segments 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: tmjljn/zaAth Fixes: Timeout Fixes: 45875/clusterfuzz-testcase-minimized-ffmpeg_dem_AAX_fuzzer-6121689903136768 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/aaxdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/aaxdec.c b/libavformat/aaxdec.c index 0ae4057a53..baa405bb17 100644 --- a/libavformat/aaxdec.c +++ b/libavformat/aaxdec.c @@ -251,6 +251,10 @@ static int aax_read_header(AVFormatContext *s) size = avio_rb32(pb); a->segments[r].start = start + a->data_offset; a->segments[r].end = a->segments[r].start + size; + if (r && + a->segments[r].start < a->segments[r-1].end && + a->segments[r].end > a->segments[r-1].start) + return AVERROR_INVALIDDATA; } else return AVERROR_INVALIDDATA; }