From patchwork Mon Apr 19 18:23:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27096 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp760311iob; Mon, 19 Apr 2021 11:30:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgzDyjK+OJwvk92hZtBAoH39GfBcD38kcf2dI0lFa1Aaz7l9YnUa4ClmJTFXbDxT5VK+J7 X-Received: by 2002:a05:6402:37a:: with SMTP id s26mr8915374edw.159.1618857014186; Mon, 19 Apr 2021 11:30:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618857014; cv=none; d=google.com; s=arc-20160816; b=Mq6qd1OpvBVOZ6cv3MSXR4MEVLtI6II4CS0ttiqHnVw7MlZVgIApcVDIKhMsI2KNQ2 l/5jkmz7MhKqKOz1+OGprDiPS3Qf7w7xBIw6jdEI6XdT2ZpaKTbnBBheRW8N2IOSap/B wtLJEHgy9psL2OzclunWOrT5hyEQzgCHniTc36VjTU9+VRayhXQGEqA7T/eiWbB9ycaD 2/KObpNnZOFziz7vxJSROIRfKC/A1lv+guk4I8+ttAa++4qMGi4IHCrXndKF0rMNeDa8 D51KTQpOXd4KWpfIuqlBVYz4j0GZJmIyXqO/YbBcTgD1J4jVZXkM3WoRJjHp+c66xwE2 HaDA== 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=9f0ZGKRJL4FhX2MXqPY6dN3ueKX7yJKVBi8TlVoUQoA=; b=0FelQZW7h8mC7L2kWu10gOVK9RasmS9aZ2iGEbkK/4CletsxopbZq19ms1QPssbOVF tUvSvRBlt/3BuB5NBCQ4TRwkOvU7uCSEMA+MUjeZwlfCpPofCEKJNe80kvPKpY+wOhSd HmqL8JDVJgtqPk17vaTv6ZZlE2mgxBMtNbt8lc+1LdIfhfd6+ai0diOgg418lKUofY4f V5S9oVAk/TICcD+/Gmkvb1sO4v3I9rOP5gDtkDMMIhnwu8k+RyiYp9SGBZc1zyold9Hf WxdKCcYxuJObehsu7zWUfVm1ptHk6WiojiG3MWHtvJno/OSIWLJHy5AFIVIY5hbSwFV/ pnxA== 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 z13si12650149ejp.97.2021.04.19.11.30.13; Mon, 19 Apr 2021 11:30:14 -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 0BEC9687F19; Mon, 19 Apr 2021 21:30:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 979A9687F19 for ; Mon, 19 Apr 2021 21:30:00 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lYYZk-00Aoau-0U for ffmpeg-devel@ffmpeg.org; Mon, 19 Apr 2021 20:24:48 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id YYYmlPiAhljeHYYYmltlkX; Mon, 19 Apr 2021 20:23:48 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=IbpKE9J5JjbRPdVnRWgA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 19 Apr 2021 20:23:44 +0200 Message-Id: <20210419182346.4445-7-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210419182346.4445-1-michael@niedermayer.cc> References: <20210419182346.4445-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfBu2m8B3WDCMJZR0X7JeupBWSW0kdg0JYyJ1X2qwvyyQb45b+JHCi76evJxw5NDvs9UMP6yM9SIN6fNg4OLeUNceaAQ2wUU9IHLTOHsT7b0nZ8LCfj/B s2phGLuJCcxrbhcxtayuqxcZkJj4DNwCxWoNjJTOx+FO4EFmi3x43EII Subject: [FFmpeg-devel] [PATCH 7/9] avformat/id3v2: Check end for overflow in id3v2_parse() 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: b4YXTj6uU2KI Fixes: signed integer overflow: 9223372036840103978 + 67637280 cannot be represented in type 'long' Fixes: 33341/clusterfuzz-testcase-minimized-ffmpeg_dem_DSF_fuzzer-6408154041679872 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/id3v2.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index e0fef08789..0f7035d4c5 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -824,7 +824,7 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, int isv34, unsync; unsigned tlen; char tag[5]; - int64_t next, end = avio_tell(pb) + len; + int64_t next, end = avio_tell(pb); int taghdrlen; const char *reason = NULL; AVIOContext pb_local; @@ -836,6 +836,10 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, av_unused int uncompressed_buffer_size = 0; const char *comm_frame; + if (av_sat_add64(end, len) != end + (uint64_t)len) + return; + end += len; + av_log(s, AV_LOG_DEBUG, "id3v2 ver:%d flags:%02X len:%d\n", version, flags, len); switch (version) { @@ -1057,7 +1061,7 @@ seek: /* Footer preset, always 10 bytes, skip over it */ if (version == 4 && flags & 0x10) - end += 10; + end = av_sat_add64(end, 10); error: if (reason)