From patchwork Wed Mar 23 14:05:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34935 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp895703uaj; Wed, 23 Mar 2022 07:05:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyotnyKjk2q6vwz7Tj/EW5q2PHFJMLnZ15Y+JLB4lHaWcUXva0IBs9A5s5gpehDTfew3Zz/ X-Received: by 2002:aa7:cad3:0:b0:410:b188:a49a with SMTP id l19-20020aa7cad3000000b00410b188a49amr239166edt.416.1648044334631; Wed, 23 Mar 2022 07:05:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648044334; cv=none; d=google.com; s=arc-20160816; b=BiT2D8fk6Uxeke5d5wCB5V1g2pIBSXgdtpDkJQmmc6o5CiNWhwkQQgrV76gh80MfE6 Qw+WauAH315vzba6Id3x7kKPxe3wYJrnr8rnk2brt91j1iz2OrmC2X9cN3vNc5ZEgAYA w9jT46prGcGc2Jo2QJsxEcVVrO7r38L8+cKi9fKeRpBAXs7PWCqHJt8kNriICBVltlh/ LI5JGDFm5x0e6YXXkmv++gf/S/NgqKY7z25uIXxLTDIaAA8yKH/LgGNnKvnfW1RL8Mbf RJNgrY27AhLjWmZRu5wpeG9zwmaXRaaRbbReqHMpQB+svs32hR1njhjqsvN8f+Ny8Kj5 9zDw== 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=RL4kZMWGfbaanPDNNLD2LxeNKsBsJat47Rczq92QDHw=; b=aZrWe0RMlUHCDhMO5IzbSHbyFIeEtaYwhvVIhvefOdoXbdUpZwsnurQq6uDYI3AIxQ 4h5HXB2ihL3O2YSnEqE5FetbaswGc3piPTgccU2Wkl7Zg7wWh/0wpz7IYZwu+T0ppLnL yr4YLI6tlKVKmfZJPhgEhaeHh3TFF2O0I/Ki0k/T5afmpYssRNSNedpAmYuKZh1BqB4n oe0xaiog7WOjtW5qtA4l97peYVbfccuy72TxlAmMJVivwMf8VSxTcocS6oXoERAkR25X M3awsqzPeltqoauUi/SfTik59H9KFgdn0I+yavzxXyXy7yiFiESPDcqKHJIjYOcNc4fj PZVg== 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 fy20-20020a1709069f1400b006dfd7c152fbsi9631062ejc.103.2022.03.23.07.05.34; Wed, 23 Mar 2022 07:05: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 1191E68AF9F; Wed, 23 Mar 2022 16:05:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-1.mx.upcmail.net (vie01a-dmta-at02-1.mx.upcmail.net [62.179.121.148]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5975A68AA35 for ; Wed, 23 Mar 2022 16:05:24 +0200 (EET) 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 1nX1c3-0005Xf-D7 for ffmpeg-devel@ffmpeg.org; Wed, 23 Mar 2022 15:05:23 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id X1TDnbHTYSgGFX1c0nRtc1; Wed, 23 Mar 2022 15:05:21 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id X1bjn6FQM8eSWX1bjnzIK7; Wed, 23 Mar 2022 15:05:05 +0100 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=KKE5sHJo c=1 sm=1 tr=0 ts=623b2920 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=VkvMtx6co3uGi7KOTpAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 23 Mar 2022 15:05:02 +0100 Message-Id: <20220323140503.26844-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfDkkZhY8NV+wkb9IMPC2+4of6V0P5hythrwjAh+pWyWRGfYUI98R+A6MRiJlPsuuNGwjkjWekR8s0qmQWhZNF/40Jhaskk2f4IS9K2u8lTgf5Jdr0HxR BaCl2cl4bnfvzenG/JCpYos5lfPBclW3wK76GoO+2RQYgCxfGAMmDDiEkAuCYrEBycMwAdnVDTGrnA== Subject: [FFmpeg-devel] [PATCH 1/2] avformat/aiffdec: avoid integer overflow in get_meta() 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: qCTDu128aQ+y Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 45891/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6159183893889024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 3634bb4960..5236cc2807 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -72,7 +72,7 @@ static int get_tag(AVIOContext *pb, uint32_t * tag) /* Metadata string read */ static void get_meta(AVFormatContext *s, const char *key, int size) { - uint8_t *str = av_malloc(size+1); + uint8_t *str = av_malloc(size+1U); if (str) { int res = avio_read(s->pb, str, size); From patchwork Wed Mar 23 14:05:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34944 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp982174uaj; Wed, 23 Mar 2022 13:58:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUEUMYZd1J5GxxmJ1xIBSJczAbT+AEX3yygpTAn+8pjzGpqO8NIyEfO+YJ8rt11NKBylRo X-Received: by 2002:a17:906:3082:b0:6e0:111f:8986 with SMTP id 2-20020a170906308200b006e0111f8986mr2089413ejv.677.1648069081148; Wed, 23 Mar 2022 13:58:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648069081; cv=none; d=google.com; s=arc-20160816; b=rYgwKfTE9tKPWNlJeKJcUbUdT+2aWXo/kjoHyb2TVgZ6lAEipuhygh3DCz8/p9eXCm 2oSiHXNTVPABJKshX25XAH11+yfr7z8tbuPOdBm2FsMr8aa/ZONRIsqNZdZJh7vxMcYS qhdLhdKFKmSSgJmqjHjTpWyb2q4eJItSX7G/jIQh6/miNm2qj3R1zAYErCIGugb44T/Y khxIY8RKMsP4paTYAsb5T84QMrimJw6SqZ6a9Kn5E+D1JQBdAzQcX0q893fW9ZQ5a6MH H5kARCSN2nH5sPr3qNakK51H9fLO6df8FJ1qVlLwbDazB1ZbNHoawVySnV1qpgwljWYN moWQ== 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=ibSSShV0cE+u2keCtjcc5JHFVj/OWel+DpA1QXl4cnk=; b=nqjp0Q8/uBYB29xvemZJNYmJHkNHM9jQ3Jzm1/OmJz436OhK2um/8aQwaSuZbYZ4PP vkCPmWRONNuCPkQbMMa40sPMW4b8It+LYkHTzaCxmiDrlGZWM2sfepv51itVqvugoFk3 Z9i0ElWh/Jk1oyCKavzR1Wfh4NQLN7G4mFcs/wtsMbWl691BtwDc02WeEiZ71R76SFRs v+wX68FlKZQx1E/CWHeMXv63n1OkNziLfMRxXh74q+BsTvVIdg+/6pboj1nch1e8gNLa HzwGZxQv4wwqpoz3knPkTWDAerahE+RrU+2E0chM7VDiQAf+ENROMlj6AF+rFyd7F5GW Gz4A== 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 m14-20020a50930e000000b00418c2b5bd4bsi17529986eda.45.2022.03.23.13.57.46; Wed, 23 Mar 2022 13:58:01 -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 9B75E68B151; Wed, 23 Mar 2022 22:57:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 491F068AA63 for ; Wed, 23 Mar 2022 22:57:35 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nX1c3-001NwF-DC for ffmpeg-devel@ffmpeg.org; Wed, 23 Mar 2022 15:05:23 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id X1c0nbUOdSgGFX1c0nRtc2; Wed, 23 Mar 2022 15:05:21 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id X1bln6FSZ8eSWX1blnzIKf; Wed, 23 Mar 2022 15:05:05 +0100 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=KKE5sHJo c=1 sm=1 tr=0 ts=623b2920 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=vZLi97uOGu7UR666kEIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 23 Mar 2022 15:05:03 +0100 Message-Id: <20220323140503.26844-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220323140503.26844-1-michael@niedermayer.cc> References: <20220323140503.26844-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDkkZhY8NV+wkb9IMPC2+4of6V0P5hythrwjAh+pWyWRGfYUI98R+A6MRiJlPsuuNGwjkjWekR8s0qmQWhZNF/40Jhaskk2f4IS9K2u8lTgf5Jdr0HxR BaCl2cl4bnfvzenG/JCpYos5lfPBclW3wK76GoO+2RQYgCxfGAMmDDiEkAuCYrEBycMwAdnVDTGrnA== Subject: [FFmpeg-devel] [PATCH 2/2] avformat/aiffdec: cleanup size handling for extreem cases 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: 3iZDsxMlqqwj Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 5236cc2807..2bdcd1362b 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -53,9 +53,9 @@ static enum AVCodecID aiff_codec_get_id(int bps) } /* returns the size of the found tag */ -static int get_tag(AVIOContext *pb, uint32_t * tag) +static int64_t get_tag(AVIOContext *pb, uint32_t * tag) { - int size; + int64_t size; if (avio_feof(pb)) return AVERROR(EIO); @@ -63,16 +63,16 @@ static int get_tag(AVIOContext *pb, uint32_t * tag) *tag = avio_rl32(pb); size = avio_rb32(pb); - if (size < 0) - size = 0x7fffffff; - return size; } /* Metadata string read */ -static void get_meta(AVFormatContext *s, const char *key, int size) +static void get_meta(AVFormatContext *s, const char *key, int64_t size) { - uint8_t *str = av_malloc(size+1U); + uint8_t *str = NULL; + + if (size < SIZE_MAX) + str = av_malloc(size+1); if (str) { int res = avio_read(s->pb, str, size); @@ -89,7 +89,7 @@ static void get_meta(AVFormatContext *s, const char *key, int size) } /* Returns the number of sound data frames or negative on error */ -static int get_aiff_header(AVFormatContext *s, int size, +static int get_aiff_header(AVFormatContext *s, int64_t size, unsigned version) { AVIOContext *pb = s->pb; @@ -101,9 +101,6 @@ static int get_aiff_header(AVFormatContext *s, int size, unsigned int num_frames; int channels; - if (size == INT_MAX) - return AVERROR_INVALIDDATA; - if (size & 1) size++; par->codec_type = AVMEDIA_TYPE_AUDIO; @@ -215,7 +212,8 @@ static int aiff_probe(const AVProbeData *p) /* aiff input */ static int aiff_read_header(AVFormatContext *s) { - int ret, size, filesize; + int ret; + int64_t filesize, size; int64_t offset = 0, position; uint32_t tag; unsigned version = AIFF_C_VERSION1; @@ -226,7 +224,7 @@ static int aiff_read_header(AVFormatContext *s) /* check FORM header */ filesize = get_tag(pb, &tag); - if (filesize < 0 || tag != MKTAG('F', 'O', 'R', 'M')) + if (filesize < 4 || tag != MKTAG('F', 'O', 'R', 'M')) return AVERROR_INVALIDDATA; /* AIFF data type */ @@ -253,10 +251,7 @@ static int aiff_read_header(AVFormatContext *s) if (size < 0) return size; - if (size >= 0x7fffffff - 8) - filesize = 0; - else - filesize -= size + 8; + filesize -= size + 8; switch (tag) { case MKTAG('C', 'O', 'M', 'M'): /* Common chunk */