From patchwork Mon Apr 19 18:23:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27100 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp760589iob; Mon, 19 Apr 2021 11:30:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZH7VVPdSJx9H1F55LLyGjhcs5153V03eF1bbZlqRsj6awX77nJIHdzqv/fnUSjnNZa5k1 X-Received: by 2002:a17:906:cb1:: with SMTP id k17mr23237165ejh.307.1618857034531; Mon, 19 Apr 2021 11:30:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618857034; cv=none; d=google.com; s=arc-20160816; b=a5sL7mk+6jCVuP4qmtsuyQdjjBOYF2OZ1goPJaLPlRlVHq3/7KMoQ0b0SqkOjqSnUN 4ujZfZnxuLOHnvzoJReudQy4Qm6Pav9NVFMiC/bcPjHFe67byx0/3M+dmym7pcuZakaI 1FgNYCzantvcm1yev4ABK4VzMY5gRj/w97RN0aEWXhRhCjY/YOgwpWkdHLLM8THdFD7f N0v7MAv79gX354C9b3aX+HOq6KYyqnNlobJ5Zknr3agNwr2IHH0ioks1sYFMpq8Zy5yU zMzBaYsVioHjC1eEjlxZP4Web1gZvebCDkzBwXb82YN+/Tit7UQxSrkPseYlA+SwBn+P CwjQ== 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=B3XegrDJjTy5Y3F8jwZcYcOf8J6415w8aZV/Yf7Im+k=; b=xfwIaWIeCsCdUIAv3I0iqc2N+rla0Oygd87XwAB6hPw/hZTO1K8kj9dQ7x6D7nc/mm cdHM+cOajl8xT5Gx/Ase/PCxcAW/o2ZGyqTGMBQ+wXAz9K1RWgXLm273y0t/Mwytt3pt HNlLN1lWU7bzcVv+8jELmhDnqguT+ySQ0akt5fg9v+JvCwb3hcyS+yCHCqcBx6atTi7n 6yZTp+zNkkIN+SdpPFhJZzhbpX3kxtC5o+Mzws/BDzWBE6fJMcoUcfUqGpg3z4gk5HBi kssuCg7tZeSlEDwpeuLGnpfa7ZSMiZOFz/df9HJ0vRmcPm3PSyQXM0YEhacXTQLfch+i f8Cw== 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 cx12si333217edb.306.2021.04.19.11.30.34; Mon, 19 Apr 2021 11:30:34 -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 1728F6809AE; Mon, 19 Apr 2021 21:30:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78D526809AE for ; Mon, 19 Apr 2021 21:30:28 +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 1lYYZk-00CVc5-0J 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 YYYllPiADljeHYYYlltlkM; 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=kZ-L1COiwVAgUAgnLXsA: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:41 +0200 Message-Id: <20210419182346.4445-4-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 4/9] avformat/wtvdec: Improve size overflow checks in parse_chunks() 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: ra2b8fW/TTEZ Fixes: signed integer overflow: 32 + 2147483647 cannot be represented in type 'int Fixes: 32967/clusterfuzz-testcase-minimized-ffmpeg_dem_WTV_fuzzer-5132856218222592 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/wtvdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 44ca86d517..2f1b192cea 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -809,7 +809,7 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p avio_skip(pb, 12); ff_get_guid(pb, &formattype); size = avio_rl32(pb); - if (size < 0 || size > INT_MAX - 92) + if (size < 0 || size > INT_MAX - 92 - consumed) return AVERROR_INVALIDDATA; parse_media_type(s, 0, sid, mediatype, subtype, formattype, size); consumed += 92 + size; @@ -825,7 +825,7 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p avio_skip(pb, 12); ff_get_guid(pb, &formattype); size = avio_rl32(pb); - if (size < 0 || size > INT_MAX - 76) + if (size < 0 || size > INT_MAX - 76 - consumed) return AVERROR_INVALIDDATA; parse_media_type(s, s->streams[stream_index], sid, mediatype, subtype, formattype, size); consumed += 76 + size;