From patchwork Fri Apr 23 17:50:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27226 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1753691iob; Fri, 23 Apr 2021 10:57:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtsoTB6PDNaSLrXPeiN21vdOqgvE31+OfrpJbKI77zlSdoj8xOcsRcVm3TkH6SQ4ndlaPl X-Received: by 2002:aa7:cd51:: with SMTP id v17mr5915788edw.137.1619200662780; Fri, 23 Apr 2021 10:57:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619200662; cv=none; d=google.com; s=arc-20160816; b=QfvvxU4jLf6CJHyU3C1kdjSFhMUoKwBgYQU5A9SlgB5hEPTeiHNLMaqH7+sM1W/kFu /JT+kRewNb4AawDgVLsnBjniZYnIKhGjD9SAcstYt457xLXz66igZ6Wl7rvsNldvjO/v ezYTtf7Qlbm9lKbgIaffAHHY4+GBfINJu9YygSvGzUycyqzN9TPrvP26aGSpUY+dij2c VHC07PCGR9Qvw2UqUZLhAHvvbBe1nDYHfRLAhlSBpR4FjO9LAuMyqoMILDrZKsilSLAi F7XlKHA01/e9CRWDj8NoOa+Dzw1bwond7o3vxXebvczGIsi8TsqNbCVx4rHuV8WAVje4 qLRg== 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=1JFbaX96dOYVtmkHEalSTQPRz7k/th5Wad8LHe6MiE8=; b=EjpD1U20j/yFg12ewh1bpeTlX60jxUtQ3QpUgGSCeHIspx6MIsYuuU1fQ1Jzs7UXvH hfTXOSnqpGO3KmRDioLAXmk9A1S0B0t6qWtv2WmaZiLzQpU7ctHJ9fZFesXOs0Mm60fx nlVRGl5fT7LUXBwmVw/IJnW0u4weSoKBCwI7yjV9YnPs/3hVk5uWsZ9JrviC9fywk4QT HuYYHJdKHpQaswAk+na8dDVsskUGqU0543RaBh7hmpe7H75q+MHoBdv4c5cOXT6MTH67 INHLDJYdj9KutCAjpla2BxmMdadYy6jZ9KygEGavdIDIHEWzqy+JmLpmchIabih4qUgS kt1w== 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 f15si6441309edm.87.2021.04.23.10.57.42; Fri, 23 Apr 2021 10:57:42 -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 B8779689A61; Fri, 23 Apr 2021 20:57:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C1246809C3 for ; Fri, 23 Apr 2021 20:57:33 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lZzy9-00CtFT-0Q for ffmpeg-devel@ffmpeg.org; Fri, 23 Apr 2021 19:51:57 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZzxBlGeZVljeHZzxBlb2oV; Fri, 23 Apr 2021 19:50:57 +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=XE_MPITcmiV4qhIzx7YA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Apr 2021 19:50:53 +0200 Message-Id: <20210423175056.24019-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210423175056.24019-1-michael@niedermayer.cc> References: <20210423175056.24019-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKPM2k8SHcfE0jCKoBXOCwCY6kBDQ7MZRVMFl7KnG8xwlNW6ve546x6zkU8nbidRcnd4w+Vx7ZQjGv68H+PxwsDfyTdnhcwgQmCYGQ4Avp07A5u0M6p8 GZLuyKjGqdngI8hkCMU3T1kGzhK7BI0bQi8qL/ZXGIVr6jJgbexNH5Iw Subject: [FFmpeg-devel] [PATCH 4/7] avformat/avidec: fix position overflow in avi_load_index() 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: t5fKeNCX00vR Fixes: signed integer overflow: 9223372033098784808 + 4294967072 cannot be represented in type 'long' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_AVI_fuzzer-6732488912273408 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/avidec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 48370fe5ce..4ab4d92f92 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1783,7 +1783,10 @@ static int avi_load_index(AVFormatContext *s) size = avio_rl32(pb); if (avio_feof(pb)) break; - next = avio_tell(pb) + size + (size & 1); + next = avio_tell(pb); + if (next < 0 || next > INT64_MAX - size - (size & 1)) + break; + next += size + (size & 1LL); if (tag == MKTAG('i', 'd', 'x', '1') && avi_read_idx1(s, size) >= 0) {