From patchwork Mon Jul 11 21:44:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36738 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1622250pzb; Mon, 11 Jul 2022 14:45:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uDE7WmMpHuX2TuYYMU1uFQis4cScU3f9325SoayOS0OC0jSgfY0oSvHepLc4DSvvFNs4Ez X-Received: by 2002:a17:907:271a:b0:72b:4ef4:2d8e with SMTP id w26-20020a170907271a00b0072b4ef42d8emr8995320ejk.634.1657575928548; Mon, 11 Jul 2022 14:45:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657575928; cv=none; d=google.com; s=arc-20160816; b=pZgMFn2zc3+r7eqznHCWbPvsPvijeB1Uge1ugd6NOQZKolkWT3Qb1AciCqI9eBwNaM I36SWoJGb9FG7OFA56iPRm8cuIRODnsbC1F5DyhjtCkJ1F6jAsLr0VL7n9piWoAKBbHS ZcOQMqAR4vj1cn2wOfimrHxIewoN/KYB5qlKfJtGmTzYEmcizc/rrF8pNfbAhScRnTH0 ev7sXeQSR3maCApIgsoj5wn5fVdJU0z/VaB3zfAMw2PsmkdPXtI/fvbUGZi8BaTfiQps HncfvXXBohvPiF5p7xpFyTSLINroj61Gn+kvyJezkdEBPlADZIy4rW9FUsJdVLwYGg3U 604w== 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=wSbOuvnkBNI8E/LOpi3v6XGpdI1JChw5mqsEykhcBuY=; b=tk+7vTiKvdZb9vgpCahrdqrDnaJ2Hvq98yghcmti+we+338XbPZeLs1oN1N3WqRVaE ENeG+vRc9iwLg3GLu7jhGurC4mCpPueOaiZWGeWaEBL4YI7UqLHzXZ3RPNXQUgDVnv/0 ZIeXAvfLW4HHCLg7lC1oX6Mc7nVpHxUDO5FlN2Ud9R2IHAHm1zOcSgzjWB89rXW8e5mo Y1PGvGXLSWB824RMyQJ3DW2mQ+5pXzxj4GIHRFUrylbzfHBWdWl+qZ/9h3eDdxh09/Ln 31/9ApsYw4J2aI0AdU8LcbwSq0zn9qM5TLGF28vNzcpEJJwH1jxfAMSoMIF80L1yMtpN ov+g== 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 ci12-20020a170906c34c00b00710ac087dd5si10236284ejb.699.2022.07.11.14.45.27; Mon, 11 Jul 2022 14:45:28 -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 928E768B810; Tue, 12 Jul 2022 00:45:25 +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 180D068B72B for ; Tue, 12 Jul 2022 00:45:19 +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 1oB1DS-00Gmdy-2l for ffmpeg-devel@ffmpeg.org; Mon, 11 Jul 2022 23:45:18 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id B1DSo4D2m8s8UB1DSoIWcp; Mon, 11 Jul 2022 23:45:18 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id B1CUoPWHyOPqFB1CUoR1r0; Mon, 11 Jul 2022 23:44:18 +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=OcX7sjfY c=1 sm=1 tr=0 ts=62cc99b2 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=6mIMkX5pS-G3LCW_aCcA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 11 Jul 2022 23:44:16 +0200 Message-Id: <20220711214417.12286-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220711214417.12286-1-michael@niedermayer.cc> References: <20220711214417.12286-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMmitmN2ajv387QEUdx5iuf6iFqj+9Ph5VeOSuDpUXcSu6zCoveL6HDbDwXIvAw4vRxyAp01R7FtTsLzFjPi/GUVdQNXMZrOSnN6CTLiRpBZoo22E0Zn jYf1jdWBdx3sTMjEqgf9mKaH1fuWXI6OPP/GqAGsafKHEVRUFV+mS9r5rZOq9Um0/ENu68PMXThsTw== Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mpc8: Check and propagate more errors 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: m++AhkqndTkL Fixes: Timeout Fixes: 48846/clusterfuzz-testcase-minimized-ffmpeg_dem_MPC8_fuzzer-5278532493770752 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mpc8.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index 2822a08b55..95a1529c5d 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -135,37 +135,40 @@ static void mpc8_get_chunk_header(AVIOContext *pb, int *tag, int64_t *size) *size += pos; } -static void mpc8_parse_seektable(AVFormatContext *s, int64_t off) +static int mpc8_parse_seektable(AVFormatContext *s, int64_t off) { MPCContext *c = s->priv_data; int tag; int64_t size, pos, ppos[2]; uint8_t *buf; int i, t, seekd, ret; + int64_t ret64; GetBitContext gb; if (s->nb_streams == 0) { av_log(s, AV_LOG_ERROR, "No stream added before parsing seek table\n"); - return; + return AVERROR_INVALIDDATA; } - avio_seek(s->pb, off, SEEK_SET); + ret64 = avio_seek(s->pb, off, SEEK_SET); + if (ret64 < 0) + return AVERROR_INVALIDDATA; mpc8_get_chunk_header(s->pb, &tag, &size); - if(tag != TAG_SEEKTABLE){ + if(tag != TAG_SEEKTABLE || avio_feof(s->pb)){ av_log(s, AV_LOG_ERROR, "No seek table at given position\n"); - return; + return AVERROR_INVALIDDATA; } if (size > INT_MAX/10 || size<=0) { av_log(s, AV_LOG_ERROR, "Bad seek table size\n"); - return; + return AVERROR_INVALIDDATA; } if(!(buf = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE))) - return; + return AVERROR(ENOMEM); ret = avio_read(s->pb, buf, size); if (ret != size) { av_log(s, AV_LOG_ERROR, "seek table truncated\n"); av_free(buf); - return; + return AVERROR_INVALIDDATA; } memset(buf+size, 0, AV_INPUT_BUFFER_PADDING_SIZE); @@ -174,14 +177,14 @@ static void mpc8_parse_seektable(AVFormatContext *s, int64_t off) if(size > UINT_MAX/4 || size > c->samples/1152){ av_log(s, AV_LOG_ERROR, "Seek table is too big\n"); av_free(buf); - return; + return AVERROR_INVALIDDATA; } seekd = get_bits(&gb, 4); for(i = 0; i < 2; i++){ pos = gb_get_v(&gb); if (av_sat_add64(pos, c->header_pos) != pos + (uint64_t)c->header_pos) { av_free(buf); - return; + return AVERROR_INVALIDDATA; } pos += c->header_pos; @@ -191,7 +194,7 @@ static void mpc8_parse_seektable(AVFormatContext *s, int64_t off) for(; i < size; i++){ if (get_bits_left(&gb) < 13) { av_free(buf); - return; + return AVERROR_INVALIDDATA; } t = get_unary(&gb, 1, 33) << 12; t += get_bits(&gb, 12); @@ -203,26 +206,31 @@ static void mpc8_parse_seektable(AVFormatContext *s, int64_t off) ppos[0] = pos; } av_free(buf); + return 0; } -static void mpc8_handle_chunk(AVFormatContext *s, int tag, int64_t chunk_pos, int64_t size) +static int mpc8_handle_chunk(AVFormatContext *s, int tag, int64_t chunk_pos, int64_t size) { AVIOContext *pb = s->pb; int64_t pos, off; + int ret; switch(tag){ case TAG_SEEKTBLOFF: pos = avio_tell(pb); off = ffio_read_varlen(pb); if (pos > INT64_MAX - size || off < 0 || off > INT64_MAX - chunk_pos) - return; + return AVERROR_INVALIDDATA; pos += size; - mpc8_parse_seektable(s, chunk_pos + off); + ret = mpc8_parse_seektable(s, chunk_pos + off); + if (ret < 0) + return AVERROR_INVALIDDATA; avio_seek(pb, pos, SEEK_SET); break; default: avio_skip(pb, size); } + return 0; } static int mpc8_read_header(AVFormatContext *s) @@ -249,7 +257,9 @@ static int mpc8_read_header(AVFormatContext *s) } if(tag == TAG_STREAMHDR) break; - mpc8_handle_chunk(s, tag, pos, size); + ret = mpc8_handle_chunk(s, tag, pos, size); + if (ret < 0) + return ret; } if(tag != TAG_STREAMHDR){ av_log(s, AV_LOG_ERROR, "Stream header not found\n");