From patchwork Tue Aug 30 23:31:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37565 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp20327pzh; Tue, 30 Aug 2022 16:31:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR5PElqBIJmv4HVVw/+53xtdAENFAJw+Debkq9Pc5DJO+IGxNMpYHfSKT0Q8wlJN5loCwCtR X-Received: by 2002:a17:907:3e8b:b0:741:9c2e:1afb with SMTP id hs11-20020a1709073e8b00b007419c2e1afbmr7489957ejc.701.1661902287182; Tue, 30 Aug 2022 16:31:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661902287; cv=none; d=google.com; s=arc-20160816; b=CbUHessNbrKcUJhbB1WMTcUOQQX531uyksb2+FtVpbZzpH/Y3zePM49Q7i4uKKYChQ 5T8jZSdgcRU4ESDD4XNYbyPal9wubCA3lfxKxYdQLugSFOD8Np9b4Vkjy/tswTG5yvM/ cj3MlDsOr9eMUZ+Fji+9OhmWe3KZU8Mk73B6huDXETHYzPkNxqrhmj2nbhRzCY9s8XYG /8jmfPR8cowjwufw8B7ZUbkWLe5odvI4DFjYlSRnqLhigG5NlN/8CmRWH6jPretZLn3I zKk4Luu/JOQhk9epLJJNdTS+KRpjO1KjU1Q63RF8aVE3R3DcdimRRnA2AE8QNK6ZGASc CmpQ== 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=e3sRctUJf+GDoax2/gm1inTbD0g45NqE0+yQMXKnNTo=; b=VymYqP3skwo/aEV+PmccIyIN5YTpCVxs9a4pUuUHcP1Ud0IDxcF3PWkDIW4UQLnRvh 4Xv+CfrCls6QQb7rhH2PNyIOUOZqQcGIEl7TWs99z1Xuvh6lR171siAN8j4DEfDc7/Qn CnUNV5+KMFLCZb8E5ocozrPdtA3rea5dmW5zTKXiOWGpGJueuslET6N2mR+qL3Ol23q/ 2bqp2F/mPOEvNihz99vj0VU0O/sYB9vQzoGsEim+laSp+ftUA88DifYyHCPLc1LNgTJX EMyT9H9teCwJtqKSQOj3eSwqNeTyAIWRqU/2DbNeQwBo/93wrpOJq0jM0R8220bOkhrx CxRA== 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 u17-20020a50d511000000b00447b0cc1501si8500242edi.99.2022.08.30.16.31.26; Tue, 30 Aug 2022 16:31:27 -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 9B76368B4EC; Wed, 31 Aug 2022 02:31:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-1.mx.upcmail.net (vie01a-dmta-at01-1.mx.upcmail.net [62.179.121.145]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8047B68B4EC for ; Wed, 31 Aug 2022 02:31:15 +0300 (EEST) 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 1oTAhO-001lxI-Bz for ffmpeg-devel@ffmpeg.org; Wed, 31 Aug 2022 01:31:14 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id TAghoohij8s8UTAhNogh1x; Wed, 31 Aug 2022 01:31:14 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id TAhNoQdIV8eSWTAhNo3KAV; Wed, 31 Aug 2022 01:31:13 +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=KKE5sHJo c=1 sm=1 tr=0 ts=630e9dc1 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=Ioamj7RHcD5VtIkOl2IA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 31 Aug 2022 01:31:12 +0200 Message-Id: <20220830233112.24688-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfHzn2hbQ1APNVAgEM80rJKqMCfsm0iIkn0nBJcp4YKAJzwnheeuFHtiS6pqbJ7ecRWW+6Gthbmrq1pHE+l4JRc5fbI8uuaNNm7Pj0g4QxKXMiacl26WC EoRW66TdUH49P2OOhvdPlO4IkfaHAgROh5uNgui02o4jqxLBbQgesuhVjfN0gTZ1MfAL2jNuKbbMoQ== Subject: [FFmpeg-devel] [PATCH] avformat/asfdec_o: limit recursion depth in asf_read_unknown() 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: V7EuioaonPIs The threshold of 5 is arbitrary, both smaller and larger should work fine Fixes: Stack overflow Fixes: 50603/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_O_fuzzer-6049302564175872 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/asfdec_o.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 907be6de04f..48b7d17322d 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -109,6 +109,7 @@ typedef struct ASFContext { int64_t data_offset; int64_t first_packet_offset; // packet offset int64_t unknown_offset; // for top level header objects or subobjects without specified behavior + int in_asf_read_unknown; // ASF file must not contain more than 128 streams according to the specification ASFStream *asf_st[ASF_MAX_STREAMS]; @@ -173,7 +174,7 @@ static int asf_read_unknown(AVFormatContext *s, const GUIDParseTable *g) uint64_t size = avio_rl64(pb); int ret; - if (size > INT64_MAX) + if (size > INT64_MAX || asf->in_asf_read_unknown > 5) return AVERROR_INVALIDDATA; if (asf->is_header) @@ -182,8 +183,11 @@ static int asf_read_unknown(AVFormatContext *s, const GUIDParseTable *g) if (!g->is_subobject) { if (!(ret = strcmp(g->name, "Header Extension"))) avio_skip(pb, 22); // skip reserved fields and Data Size - if ((ret = detect_unknown_subobject(s, asf->unknown_offset, - asf->unknown_size)) < 0) + asf->in_asf_read_unknown ++; + ret = detect_unknown_subobject(s, asf->unknown_offset, + asf->unknown_size); + asf->in_asf_read_unknown --; + if (ret < 0) return ret; } else { if (size < 24) {