From patchwork Thu Oct 6 20:37:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38589 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp379171pzd; Thu, 6 Oct 2022 13:38:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5W9uaJHY9KWmzSCJFCCyzYyWzsU3x+NB7mVdiBA9W0vSymeiPVwArHCJHNPS5EpNNfse9v X-Received: by 2002:a50:fe85:0:b0:458:5562:bf1e with SMTP id d5-20020a50fe85000000b004585562bf1emr1465529edt.167.1665088690202; Thu, 06 Oct 2022 13:38:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665088690; cv=none; d=google.com; s=arc-20160816; b=RbO0Op2SVd03zu53O46+xA8KzFNLvO7H5/JxYrgoimYO6cbSwqc4fOo+TvELwAYowT c2n4pzmvw0TJvPdRvREvgxsDwnGP1qaB98TeLGGpFeD6dAN8CGg20kno/4XbSC6J3RWZ FYRZoBjJtMqUC5NX4SLSxhYSDOI2RbAn44a0JjZuz3I4pF+BVDbRM2IaFpgxfaYuO/1q J87QGaVv13JlWcghIW9pLXPoM+VACB0ytRQHuEj1EbDgDIbkZo4rL7G1eLq4KjP4bonf KKIiaRMWqVfAF3KUS0zt6+wm3YYqYygD4l/Szg13mTAwGSmsaBBgmX1epTtLZpfri5Dp FLbg== 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=JuLRCjlgCk1u5/qtSa8E9xY09fsFvojWdLAfiF0SXO4=; b=VEq+jtcOirLhqxp9PbUQCIVtzqx9ApMS1wOgZrWUke5HJg14DscfjW3+ddrNQLJWkp /Z01Nluo9bnRHSw9MC696rauJdrqqbFiHnPwvBfWbL7yYMOse01WyWEwX7tkCnLNsCpi FCO6y1aRHuSUxM1hYoDhYoVpGDK5eEg3622ik2d2DUxqcGwrfxlCrRpmsXuwExSRyVV3 M3HH1AAtaC+c1+sE5N5f4TKuGRnssVkGhbfT8EztV6SwdDAwjKj2xEWCx4W/kn2PXgOi Xbiv0jXT+BW647wBC9Tli4goaXG/AnhdsDs4Dj59K2CmAZ53jZ2qUBHV3lWIRwV3+ozW qmAg== 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 k18-20020aa7c052000000b00458111fe384si216070edo.165.2022.10.06.13.37.45; Thu, 06 Oct 2022 13:38:10 -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 C313D68BB41; Thu, 6 Oct 2022 23:37:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C801F68BA9C for ; Thu, 6 Oct 2022 23:37:12 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ogXcF-00ATjV-8t for ffmpeg-devel@ffmpeg.org; Thu, 06 Oct 2022 22:37:11 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gXc7oWRDf8s8UgXcEogS42; Thu, 06 Oct 2022 22:37:11 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id gXcDoBvIybZLDgXcEoh44N; Thu, 06 Oct 2022 22:37:10 +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=Ufwy9IeN c=1 sm=1 tr=0 ts=633f3c76 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=Ou-dB1wDnAJ2Pr8qICMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 6 Oct 2022 22:37:06 +0200 Message-Id: <20221006203709.8398-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfMmhGhszfE/rX300yfZvshp2ddiyimF9go0XzWKF+cCxcUKzK1gaT3AlLkyHBhXSbu8QInQCJHlaSp/OLOVPvyuhLTBCfyi2w7Vqtk0D46rpMiiQ2Vsm 7WJra8VmISvHnBYetCu4/pwNFVVCTxPk0RGH8XRaV2RgBh4tT7cLakRHIMUPBZn2CUItadGHNmTrwQ== Subject: [FFmpeg-devel] [PATCH 1/4] avformat/asfdec_o: Check offset before adding index entry 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: IfGuWcUKmFtq Fixes: signed integer overflow: 9223372036854550860 + 530259564 cannot be represented in type 'long' Fixes: 49093/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_O_fuzzer-4697179192688640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/asfdec_o.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index e837ca62e7f..2b407c016f2 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -888,6 +888,8 @@ static int asf_read_simple_index(AVFormatContext *s, const GUIDParseTable *g) av_log(s, AV_LOG_ERROR, "Skipping failed in asf_read_simple_index.\n"); return offset; } + if (asf->first_packet_offset > INT64_MAX - asf->packet_size * pkt_num) + return AVERROR_INVALIDDATA; if (prev_pkt_num != pkt_num) { av_add_index_entry(st, asf->first_packet_offset + asf->packet_size * pkt_num, av_rescale(interval, i, 10000),