From patchwork Wed Mar 23 09:30:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34926 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp858177uaj; Wed, 23 Mar 2022 03:54:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqJ3jfz+bnuowkPpG8G0zBtD3/HIvvqoOyE95I2ZTYK+FBB3NERGz2jEQt/Qwu1iN3JQZ4 X-Received: by 2002:a17:907:d03:b0:6da:9618:7ddd with SMTP id gn3-20020a1709070d0300b006da96187dddmr30728657ejc.341.1648032869662; Wed, 23 Mar 2022 03:54:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648032869; cv=none; d=google.com; s=arc-20160816; b=ZnTWZja12tahSyU8lb37AcgSfRAdwt+MfqA/UugwEcF+6UzZ60Nlv7y1XwumWOcmSq 8zq2yoNj9AGm4GqGhOuKP3jxtwi4qn6SmwZcJMcHvPQ2/YhPEbU7U3v55HzFrbcXWBId 5+7VHFE973b0QFDpzThUMjxPwRxw4xti/PPS7Dz2VSlMdeg2vtUvh7Cvz3TRUwy7zi4f 8nr1xOKAxXCu3CasnxdQOr0u3f96ef7pfDuJI/CGDJOeqfuA3xpi7cFUcrh/PYM77leC b0fpjO+DbgxP2MuN8Svwp2lWq5Tqp/5fLV5Yh0mb5r/ZFC+De84v8YZMZIbvPkF3dboa DfUw== 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=pRId4fi50hbbaOR9G8cPm9KjfdtEz+wTBoxQwULIc9U=; b=GSjJUnaQ9dNCbaN13z/1PjmiVcpyV+aAtteYq+vroJs37M9G3KYJSTBrYEDTH8pFJ4 UT0xtzodu78PN8pWsfiODO2kAr2LWNNqKIoTjMegOIbdTxIjnnKanxok+pfJLkGhXDQL N3CMlPbfUdjIu18iTiEw7P2z1E7bWQDawaU5iMYJ4N9nrQf75RAfM4mnlZ+kdaT9eieL 8IfqVMt7Qudjfc11WHUvoPOCJWN2CkL6Fx58dgqmyN2On93hBWNWjEUOE8wBUnJtkhkE P/Cb9RYmof4GAq3vCU1o10yeYE07VUyOPV1kE02WFCxXnWfU1s69ONo6Z9IZdwfjxsez kXoQ== 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 16-20020a17090600d000b006dfedd50cf2si9250668eji.326.2022.03.23.03.54.28; Wed, 23 Mar 2022 03:54:29 -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 F13FD68B167; Wed, 23 Mar 2022 12:54:25 +0200 (EET) 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 1163E68A8A5 for ; Wed, 23 Mar 2022 12:54:20 +0200 (EET) 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 1nWxKO-0003uN-GC for ffmpeg-devel@ffmpeg.org; Wed, 23 Mar 2022 10:30:52 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id WxE7nUbafSgGFWxKLnRFm9; Wed, 23 Mar 2022 10:30:50 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id WxK6npMuoOPqFWxK6nLAkA; Wed, 23 Mar 2022 10:30:34 +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=OcX7sjfY c=1 sm=1 tr=0 ts=623ae8c9 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 10:30:33 +0100 Message-Id: <20220323093033.24577-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220323093033.24577-1-michael@niedermayer.cc> References: <20220323093033.24577-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNSRcuRylL5CwqrwE9Yqvje5E78282fjVKTvnrgPQNCUhMWc97E6zQtlsslz7gw2E9LVrDgEei8Axy8KXggc+lcrigCR5D3+WO7jEJXP9O+8lVP9gsb7 sNUM7pZfnpRTrx4TCk9Rg0CdPJog62CXpaRpK/nVB1RAMG384K7TpK23CXVS742b8Rp3Fd8+zfkTew== Subject: [FFmpeg-devel] [PATCH 2/2] avformat/aiffdec: check allocated size for overflow 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: zC2N+ZKVFK/7 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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 3634bb4960..c2b8e0dede 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -72,7 +72,12 @@ 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; + + if (size == INT_MAX) + return; + + str = av_malloc(size+1); if (str) { int res = avio_read(s->pb, str, size);