From patchwork Sat Sep 17 21:15:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37987 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp389254pzh; Sat, 17 Sep 2022 14:16:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM78l+AjnnMzDoIwvvzSXfvP8iL5WmdKcR8Th6ZZgiuB2OnS5BrRRAMbz5cHbEQFJaIeG2x8 X-Received: by 2002:a17:906:5d07:b0:77d:132b:f4f9 with SMTP id g7-20020a1709065d0700b0077d132bf4f9mr7734303ejt.170.1663449372404; Sat, 17 Sep 2022 14:16:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663449372; cv=none; d=google.com; s=arc-20160816; b=WVwgI6QoneATrU9Wp7GtcSvjPj9Mvz7hsRx8WrgyoLj8yXsODIgP0Ms4grLilcbOQg Ce51j8+D0iZHPbH9Dc+bJSvjWzY/0vmu40XJuL02MCwfhZU6CqQ2CSpsMD7IdMVvEjwF n3cPn8sujPQDGhXw2hjaiumDrXf3N39uMVLinUgPi4DN5N0yog/0Oc+/SJDr2TKOZ9rv Z46cg5oHtTfmnsvVoH+GlavSWP3xGplzDJwQjG5r1/+t2KiTVTU7p/v0pyI3U7x7SA6q kkvkcqHZpIkmfC9zA+yH6Z/ySeN1NiuD3E/RgKT8WnJ0z7MRBMpVGFFCa4xsFogC6niv U1IQ== 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=W7ydwIJKZAgRb8F7My62xLor/775tTH1VIR6UYoI/2s=; b=EjZZd1Gda+BRTPxytYpDH+gI6PYP7qpxrsES65Q1wFvfvxYy9LWT4A2E/n7EgQ98Oi ngU8/6KrTd1miU3BT4GQCZB60GKX6ITaI40LHAJG501Er2sWxgr+44pmjliRrDQgpSNm 9UvjQ3vqaO0SOQ/4Rt3Caufns2NQdLdJYfG0xM1QaUmQSA2G0XNPwtHv5uKKlEzjO4ci zaVzSF0XlGy6G6sAWUna7fjkAP/kyfLd1w2g9ImwyuLXylRz8BWWaBTm2ReTZ9XF8wn2 h5j0GMSq7NOaNsvaQrC8L8+8o9S9N6Io/GyUNf4F6nK3ECoiZ4DfmHZe8cA17ysRMzFn qSAA== 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 qw38-20020a1709066a2600b0077b4248b138si21541032ejc.127.2022.09.17.14.16.11; Sat, 17 Sep 2022 14:16:12 -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 D2D9D68BB9B; Sun, 18 Sep 2022 00:16:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-3.mx.upcmail.net (vie01a-dmta-at02-3.mx.upcmail.net [62.179.121.150]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2EC068B9C0 for ; Sun, 18 Sep 2022 00:15:59 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oZfAM-00350M-Kf for ffmpeg-devel@ffmpeg.org; Sat, 17 Sep 2022 23:15:58 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Zf9moPPmn8s8UZfAMoEt86; Sat, 17 Sep 2022 23:15:58 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id ZfALoibKMOG5ZZfALom24N; Sat, 17 Sep 2022 23:15: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.4 cv=KJo5sHJo c=1 sm=1 tr=0 ts=6326390e a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=NIjpAlihMiSmCakebC4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Sep 2022 23:15:49 +0200 Message-Id: <20220917211557.11547-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfE9fZPqyOvB56wBnmFJoAeXs0Ut08ojTc7zBz/CuMTKjnK6UGJnxpbBUuqrae7bNgMSA7mY4USXQGvoLDGjuAR+mSCGOLNBotLYWvRLLmJlDJo24D+UV hFG6EwZw+j8mUyufxMs8OWl2XlbJmEWlkUGDruA7/uhGshPuPs7zi61/txCk9C+IUN4MIRwaoC8e6Q== Subject: [FFmpeg-devel] [PATCH 1/9] avformat/ape: Check frames size 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: sJX8dyTGiQ+4 Fixes: signed integer overflow: 9223372036854775806 + 3 cannot be represented in type 'long' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_APE_fuzzer-6389264140599296 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/ape.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/ape.c b/libavformat/ape.c index f904fde178c..92e9ac7cb1c 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -298,6 +298,8 @@ static int ape_read_header(AVFormatContext * s) ape->frames[i].pos -= ape->frames[i].skip; ape->frames[i].size += ape->frames[i].skip; } + if (ape->frames[i].size > INT_MAX - 3) + return AVERROR_INVALIDDATA; ape->frames[i].size = (ape->frames[i].size + 3) & ~3; } if (ape->fileversion < 3810) {