From patchwork Sat Apr 2 22:05:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35144 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1275916pzb; Sat, 2 Apr 2022 15:05:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzr9L3MbqEqMCmPBYWqnJcp1eypFuExgQgvvPZAqsjcdYcCnudgrInD235n65zflAu+fy54 X-Received: by 2002:aa7:d543:0:b0:416:13eb:6fec with SMTP id u3-20020aa7d543000000b0041613eb6fecmr26992610edr.348.1648937140623; Sat, 02 Apr 2022 15:05:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648937140; cv=none; d=google.com; s=arc-20160816; b=0UoFSNmyQtn9u4Sc79KtIK9X1qqHTbAhPnw2vDKw0LwUlkJtCe0CZe6pBhqpNYJpYW t3FtAN22PIaIjkmAjVsThhLnHpBMD45Kyo5dEro26l7kxmZq3OY9c+lRjwp9g8jUl0Xr qRkgIWDlg/JwuQnLoBN0w/+etAqnvgN20UzuTAZK964yA4KU+q4AiwW9UXjEmPOuFETF 0Qf8FbodBKVdBe3TorEyaQJ/LaHJGYrulL9olaBhu45qry/87We2V1QM9+iwaj2Tmo3I PrdU5ghTizbOhTX/tbRiPGsofEJZu9gYvmjF2vOu2lQWna1g3vOuOIO6k0Q3X4IQAva1 VmQg== 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=yKLPWglQQZNsDp6Xa7N4e2ouT2DTwT/FNSMY6WzPr9Y=; b=0aBLIkaP3pneCKqan/xb/hYzyRQSz9h/8AlMZ5EV6Bh2AKSo+He6VJ2Iq9v/LABkNC cHdGykQSv8HbORME5b3A2212XlKVpQILptTXZwg23pJkPqk2kT2G6q/QPIYZQ4wUryya faxnD8+lX7wzf/fV/ddXaPDO2lbU4H4OUFg0z61+YvnC0eb6nJ/ZKvXpI7/2WS9MT8S1 P4EegnolCt1Yu5YZw1v6UA7jC85E8QaGd5g6YUzvDvmMBd3R5AULCXtaWepA2aYVopG1 BLTomrnHhDffqvpkCkj3gGs6viIxJkkhslGfg8cyWlvJKPHhpz9pI4Tg6qDMg5hQIkhm eMsg== 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 ju2-20020a17090798a200b006df76385e36si3834384ejc.726.2022.04.02.15.05.39; Sat, 02 Apr 2022 15:05:40 -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 090F168B205; Sun, 3 Apr 2022 01:05:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-3.mx.upcmail.net (vie01a-dmta-at02-3.mx.upcmail.net [62.179.121.150]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 427DF68AB53 for ; Sun, 3 Apr 2022 01:05:29 +0300 (EEST) 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 1nals8-0000W1-CE for ffmpeg-devel@ffmpeg.org; Sun, 03 Apr 2022 00:05:28 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id almonGm73SgGFals8npwK1; Sun, 03 Apr 2022 00:05:28 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id alrtnhDfNOPqFalrtnUeTn; Sun, 03 Apr 2022 00:05:13 +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=6248c8a8 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=OwfnYrYvV8TBtMRJG2gA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Apr 2022 00:05:12 +0200 Message-Id: <20220402220513.1709-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfJwEMiJTo46Fle+LI4oJEWkgZRIKbvSdDhT4jutUU8g8BDHJLjvPBuispDLhBZQWUgnfyh+rtogUAqszAjvSCXFL1vpBwVNQ4uAeSpqib5e1/F0K+iKG i885FbCYI18GgHjPU7Omc5nDgpN6n3dISVdlQ4WYTdZP2IVnSIpMNxZwR0Fa13c5LaT0Zd9dUgmtIA== Subject: [FFmpeg-devel] [PATCH 1/2] avformat/ape: more bits in size for less overflows 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: OXwA1+qit80m Fixes: signed integer overflow: 2147483647 + 3 cannot be represented in type 'int' Fixes: 46184/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-4678059519770624 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/ape.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/ape.c b/libavformat/ape.c index f5e50046e8..bf1254e7bd 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -42,8 +42,8 @@ typedef struct APEFrame { int64_t pos; + int64_t size; int nblocks; - int size; int skip; int64_t pts; } APEFrame; @@ -128,7 +128,7 @@ static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx) av_log(s, AV_LOG_DEBUG, "\nFrames\n\n"); for (i = 0; i < ape_ctx->totalframes; i++) - av_log(s, AV_LOG_DEBUG, "%8d %8"PRId64" %8d (%d samples)\n", i, + av_log(s, AV_LOG_DEBUG, "%8d %8"PRId64" %8"PRId64" (%d samples)\n", i, ape_ctx->frames[i].pos, ape_ctx->frames[i].size, ape_ctx->frames[i].nblocks); @@ -146,7 +146,8 @@ static int ape_read_header(AVFormatContext * s) AVStream *st; uint32_t tag; int i, ret; - int total_blocks, final_size = 0; + int total_blocks; + int64_t final_size = 0; int64_t pts, file_size; /* Skip any leading junk such as id3v2 tags */ @@ -387,7 +388,7 @@ static int ape_read_packet(AVFormatContext * s, AVPacket * pkt) if (ape->frames[ape->currentframe].size <= 0 || ape->frames[ape->currentframe].size > INT_MAX - extra_size) { - av_log(s, AV_LOG_ERROR, "invalid packet size: %d\n", + av_log(s, AV_LOG_ERROR, "invalid packet size: %8"PRId64"\n", ape->frames[ape->currentframe].size); ape->currentframe++; return AVERROR(EIO); From patchwork Sat Apr 2 22:05:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35145 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1275965pzb; Sat, 2 Apr 2022 15:05:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwszg5OICJ3DhDx9xtwkIADybnMlbQ3UCTLkkaZkD8H8aXvbfbVlgwuDQQHeyRuj4cF3VJV X-Received: by 2002:a17:907:2d90:b0:6d8:9fc9:ac36 with SMTP id gt16-20020a1709072d9000b006d89fc9ac36mr5261670ejc.28.1648937151076; Sat, 02 Apr 2022 15:05:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648937151; cv=none; d=google.com; s=arc-20160816; b=jRRR5Akg6M26SwpGeIocrYL2CBri0KmSpcO850wkE7UFGrxERWhzEKLoHWZkXy4i24 l8w4MVVJ38By5a7V4q4dO+pqnqTrEWe77scd4ssrwORFCC+fIbdu4EkXvMIlj4UdMyab uQZq7sxg9SQsE16vZDkXOZGqQqJBOSoCOUpEwgPrs7oVHc/ZUECWrOx7Vj3mxOdpzMAK yVOzDfH9uhy9q1o9xybzQMfCxbF3Oo/oj10sIR/euRETF5RRtLsKODK/l6q/gf2U7DbT VfU62Yiz7asTZtexPDdDG03vU433iu3wC95bo45NPn8vPqv7OQrlrrS71AKjC2aYhgXg xtpw== 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=aXAuudFUTuoKMXI9nxi/gcTcK61eEkcXImsbo2llOfg=; b=MUvWc1tWreVat2fA0UpM5yYdtzf5hq6wJoTI1eCvEIBdgRbnF/q+9tanFEZ2a/C5Mo C1PO0DvaLEttzEAwAAa4J+SBDxbrP/sb7lutwsbyRNvMHiiTKmfNfLq3XZj8+MwoX9tr g05xdzoEmsEfZ/SMIlNUcDoVz5dtZx8Q12qxM07Kpwfz/AMOpUFd5D9Nd4baBnt8JUOY isFasokdNlHg3JtKCiDHgPSTajwPQXUpGEA7A2S41Cd9Yut2V/lSb+yJ4yW9qjIIaEo0 YRGK5madwuvv2D49YZXnAtcxgSsTba4ZjikV8j8u0pVBXTANN6hswICoJc1js/s+mWk/ d6uQ== 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 s2-20020a170906454200b006df76385e67si3746900ejq.775.2022.04.02.15.05.50; Sat, 02 Apr 2022 15:05:51 -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 EC74868B21E; Sun, 3 Apr 2022 01:05:41 +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 D8F4768B0D6 for ; Sun, 3 Apr 2022 01:05:35 +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 1nals9-0009AQ-1q for ffmpeg-devel@ffmpeg.org; Sun, 03 Apr 2022 00:05:29 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id alqanGsx5SgGFals9npwK7; Sun, 03 Apr 2022 00:05:29 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id alrtnuWrk8eSWalrun8XSp; Sun, 03 Apr 2022 00:05:14 +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=KKE5sHJo c=1 sm=1 tr=0 ts=6248c8a9 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=MG81yj7za5pdsvtCDHYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 3 Apr 2022 00:05:13 +0200 Message-Id: <20220402220513.1709-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220402220513.1709-1-michael@niedermayer.cc> References: <20220402220513.1709-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfF2Mr0Q84IwiPqD+FJTQF8RrApDJniGJbXqCYwCWSYDV6gAatDH8WBK+uyWGl0fS9HihKahHU/nL0FheinQLxCNbW0Dj72N7fHo49jLwCi+WHl6N/Raz eS0DpcEv3W6u8COV4y87mlkhFG+LiXVzOV9y3Nq9VCMf1agj8CXuhGx2nQ0LOr6mNn48of2G1d8YRg== Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/binkaudio: Clear state on EAGAIN 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: y8E6QzWRHrIP Its not supported to maintain a frame as receive_frame() argument over multiple calls Fixes: store to null pointer of type 'FFTSample' (aka 'float') Fixes: 46231/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINKAUDIO_DCT_fuzzer-6276566037954560 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/binkaudio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index c4f3e743e2..f8cdc9f0cf 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -301,8 +301,10 @@ static int binkaudio_receive_frame(AVCodecContext *avctx, AVFrame *frame) again: if (!s->pkt->data) { ret = ff_decode_get_packet(avctx, s->pkt); - if (ret < 0) + if (ret < 0) { + s->ch_offset = 0; return ret; + } if (s->pkt->size < 4) { av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");