From patchwork Fri Jan 6 23:09:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39906 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp1492485pzb; Fri, 6 Jan 2023 15:10:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXu34xWZmd3nTKbTqDlgbxDlV3pLyeaRBYEbDqEbeuifZZyfAjrJAhwYKryFZrzGFQTzPsdJ X-Received: by 2002:a17:906:c18d:b0:843:770e:777d with SMTP id g13-20020a170906c18d00b00843770e777dmr47475426ejz.11.1673046607002; Fri, 06 Jan 2023 15:10:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673046606; cv=none; d=google.com; s=arc-20160816; b=ZyfIan3dEh3kKClpQZEkZDS7g5JehKThvsdVrJ3Sns/uHnysqiqzAnmnI44lRVf3HX Oc5XhseMW+skSe6AEZ6CIm0UKZb8+JFkZC997+tqNDEklvrlmtvttesP5EaGH9H3Mwdq Pq/Ail0EoP+vMtvPb91AnjuLHzkWW7r4Zky9FT15vFJiwgHfiK58wCTzK8m0WsgUsA47 DuPrJodyexdetduqp5EkkGrSwuN6RcOTqN6VbQHnFwivzmO+mrf573u0D3z40Jm0cfV6 jZzzh9F7YJcyfDOPPPm6lhCGoKnV7ib5I7BHbVISNRlU02HO3x//GrFEUxwlUGEkx2Nw 1r9g== 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=PJfiLdkSoB3Fs3iRSfRBaXQGukRxrpEBWvyBdXjktlA=; b=0Cc6ruEervcYVMk61Y2HicnSP+SdWovSrS4QLLtATe/1x/OLQynR1odGyLQoGltsfQ FCemW/QW3eqk5mHKiB1SiEveVnTIaWhj3ZpEQUc1yKAtcmG5ey2R5rD894c+wvU2cvWB BBoo0cb7VVFpa8LjPINMcNP/UUL1+BRIUN7/Ag9vU+Xkr1dvDqrVz0eMXUPIKJ8Ljtl8 MhHOKUuuKteChbn7hQZYT+KyMU4OPP5kN5P8Jzx7MEFH9EWympPe80WjHw3hpbeHOf+S KXY7r1/oqYJytS6BxeLPZ/FvLwuAr1CGyYDfP7lbm9dhuwcnqoq/ILV2cdQaUvQoVQe8 4YLg== 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 oq19-20020a170906cc9300b007acef3bec44si2142880ejb.221.2023.01.06.15.10.06; Fri, 06 Jan 2023 15:10:06 -0800 (PST) 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 B60E768B74D; Sat, 7 Jan 2023 01:10:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3321168B74D for ; Sat, 7 Jan 2023 01:09:54 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id E72AAC0005 for ; Fri, 6 Jan 2023 23:09:53 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 7 Jan 2023 00:09:52 +0100 Message-Id: <20230106230953.25054-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/eac3dec: avoid float noise in fixed mode addition to 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: bXmYWn/k9Kjd Fixes: 2.28595e+09 is outside the range of representable values of type 'int' Fixes: 54644/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AC3_FIXED_fuzzer-4816961584627712 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ac3.h | 2 ++ libavcodec/eac3dec.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index 24304caa61..2386c15ad0 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -53,6 +53,7 @@ #define AC3_DYNAMIC_RANGE1 0 typedef int INTFLOAT; +typedef unsigned int UINTFLOAT; typedef int16_t SHORTFLOAT; #else /* USE_FIXED */ @@ -73,6 +74,7 @@ typedef int16_t SHORTFLOAT; #define AC3_DYNAMIC_RANGE1 1.0f typedef float INTFLOAT; +typedef float UINTFLOAT; typedef float SHORTFLOAT; #endif /* USE_FIXED */ diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index d360b02691..deca51dd3d 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -138,9 +138,11 @@ static void ff_eac3_apply_spectral_extension(AC3DecodeContext *s) // spx_noise_blend and spx_signal_blend are both FP.23 nscale *= 1.0 / (1<<23); sscale *= 1.0 / (1<<23); + if (nscale < -1.0) + nscale = -1.0; #endif for (i = 0; i < s->spx_band_sizes[bnd]; i++) { - float noise = nscale * (int32_t)av_lfg_get(&s->dith_state); + UINTFLOAT noise = (INTFLOAT)(nscale * (int32_t)av_lfg_get(&s->dith_state)); s->transform_coeffs[ch][bin] *= sscale; s->transform_coeffs[ch][bin++] += noise; } From patchwork Fri Jan 6 23:09:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39907 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp1492579pzb; Fri, 6 Jan 2023 15:10:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXtDcJFDr4pA7D3tOW5GhimQN/MIyVeiYCV2C1z2FmlxlPMYkkqM+O/On7kERLDO0v3VSaly X-Received: by 2002:a17:906:fb97:b0:7c1:64dc:ac3c with SMTP id lr23-20020a170906fb9700b007c164dcac3cmr49569793ejb.59.1673046617330; Fri, 06 Jan 2023 15:10:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673046617; cv=none; d=google.com; s=arc-20160816; b=a7jevOJFgDgNoP5cdvTzCMvaLrirquNcS+J6I/jBg2u7zyhuEN+6M2VstJhhGXtJyD 2Zu+DJiHFBVLB1dZ4cDy+Ve2KVFZO1tHg7og5co7R5UZm/42BKWMbhX2WXoqMcagBN57 /E335WJRLp4lDSqtJtudJT2dzMt2rfzmtlA642T32h/q+j2iHPsppmMra3OduL2ROYwv VXgKif76bVyNH5hyjpzG+W11SMHa3NnnH5pSKFRWF7W2DHNFSLTrCzK8YaLwW6IiF/yU VpsxKkgcT4vLMPNP/hxEpHsOk3Y1VFvYg1/jmgqE9c8uQqQqO3YpXCmPHCp88m7zVJ4U B85Q== 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=9PvBdaCXYlsOe22I1LggwWF5L1EDlqMaxynAbuWwStc=; b=JsziHVC2AuW4C9eY+3Q3egJbXpEEmb9fED6unPp/Lr6/ATXyyrcYWIp+qzGrqLmYit eiFhPAJqEHjby+qboIuLQCwMKAIWB1gVoKXdnT7khUjzX/S0N8P66XVhNoBYODX0zu9I P35bBRWerbyTeqBacjzaO1EIZtIlrNQb21DmYouVInuFfwCAFleuyOxPTxJTVS4IENSy qYO+4dIjN9KcaFgzyOjSX4uol4N86EK7XNhCeNIj9q6qyDlkJEQFiix5r6Yj/FWmgEg/ qZ7Nf8Cnn363TIEyedoMo9aUAO1Bph19pPBs5uMuN0snXtx+OA6gz3+5rzZiQDmbucoV zWTA== 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 e22-20020a17090658d600b00839f873bf66si2807236ejs.320.2023.01.06.15.10.17; Fri, 06 Jan 2023 15:10:17 -0800 (PST) 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 B8B7568BD39; Sat, 7 Jan 2023 01:10:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B2C868B74D for ; Sat, 7 Jan 2023 01:09:55 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 2AB6E240002 for ; Fri, 6 Jan 2023 23:09:54 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 7 Jan 2023 00:09:53 +0100 Message-Id: <20230106230953.25054-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230106230953.25054-1-michael@niedermayer.cc> References: <20230106230953.25054-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/mvha: Check input size for HUFY before picture allocation 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: P6iVf+8Ss5OM Fixes: Timeout Fixes: 54772/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MVHA_fuzzer-5484199677394944 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mvha.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavcodec/mvha.c b/libavcodec/mvha.c index b1661c1c3b..55056c91cf 100644 --- a/libavcodec/mvha.c +++ b/libavcodec/mvha.c @@ -159,9 +159,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, if (size < 1 || size >= avpkt->size) return AVERROR_INVALIDDATA; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) - return ret; - if (type == MKTAG('L','Z','Y','V')) { z_stream *const zstream = &s->zstream.zstream; ret = inflateReset(zstream); @@ -170,6 +167,9 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, return AVERROR_EXTERNAL; } + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + zstream->next_in = avpkt->data + 8; zstream->avail_in = avpkt->size - 8; @@ -218,10 +218,16 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, } } + if (get_bits_left(gb) < avctx->height * avctx->width) + return AVERROR_INVALIDDATA; + ret = build_vlc(avctx, &s->vlc); if (ret < 0) return ret; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + for (int p = 0; p < 3; p++) { int width = avctx->width >> (p > 0); ptrdiff_t stride = frame->linesize[p];