From patchwork Thu Mar 17 23:30:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34827 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1357162nkb; Thu, 17 Mar 2022 16:31:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpkbEHO98vTGe3iKXc5CZH5oH6JaDANFMez6P2rLdAd4mFd2VOmrdHuXk6lEUjDS8TS7/1 X-Received: by 2002:a17:906:99c4:b0:6df:892e:cdc6 with SMTP id s4-20020a17090699c400b006df892ecdc6mr6577965ejn.384.1647559904169; Thu, 17 Mar 2022 16:31:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647559904; cv=none; d=google.com; s=arc-20160816; b=D+d4T+rmQS+BCV6ZgjlaHxH+1gAOBjB3SdLxLHFeE/ILPJ09kjfqTPjLoJPFAThc2m 1yH5ZN0bZewSccUwgRTOa/z41TRM20/KWgzKxgE6c0Xs2LSCC5Ngkk/M6R9pZ/fQj3lr sSEx6l3py4nzooJRmJTZYs18MHV2qf9lLzGhS7hrZvTiZ9CWtdRi7hhXxLfiDtT2YVr1 iDqd4exVUhqzQe3k9PzJ8/LiXMYm94c6jMzWJXvragbk9mPhfJJE4P99WQD6cGzGjTOo h/Lx0NatnvVl9ZVPqjdlwM5/ZLwfnA+GQaGe2dlu8tzW1zhJTRUPiSmM8R2/+diBY8C7 911w== 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=vcq9izMkAXAzNOvF/sBc0I2KLLlhLOMEKP1CQv6vO8A=; b=0WIzzmF+TmhRpnteyrNLKYC8hqCTUZ/hobrRhJTVj+scKR23Tc7w68BxxSlmQWIjP+ xC0cfz7J6T/oISn4C0xlkitt5+L4le0mR0UxwBCzx6toWSHzU1WPfabVSQgrpaxHIhtn u/bgyWyNOsgOrUHHZGKUYF4fuFkKgabINJTbLtCjRzw00jD8kiSytwjeE+ece37SedEs GvAl2s8E7LZMnf5QytH1Y6F5VSi2qQVglO5+0Y7yo524B96Y98HmMuA3jj2eTRdpzf9A I+NaW0fR25ST1OUiirSr6Rto4roGIz66Oq2KMnjf8ab0zdPL4SlDBQlUT/vu/Ev5q94A 1xyA== 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 g3-20020a170906594300b006df76385d32si310309ejr.466.2022.03.17.16.31.43; Thu, 17 Mar 2022 16:31:44 -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 04EAB68B0FD; Fri, 18 Mar 2022 01:31:42 +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 6269068A7AD for ; Fri, 18 Mar 2022 01:31:35 +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 1nUzah-0005fL-1d for ffmpeg-devel@ffmpeg.org; Fri, 18 Mar 2022 00:31:35 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id UzYynjWdKSgGFUzahnDT2d; Fri, 18 Mar 2022 00:31:35 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id UzZUnynmz8eSWUzZUnuNCR; Fri, 18 Mar 2022 00:30:20 +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=6233c49a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=0VC9p01ngVQWEUDz2AMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 18 Mar 2022 00:30:17 +0100 Message-Id: <20220317233019.12049-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfADZao04jaWUC9mEIwchpYE6TLe93iBSzG+foYoQAgeq1v0xPhJqLgDWOpj4gHiLV8+3bIgacFniLulfkQzDOtKKEtD6A+xHMi2NCN+65kPejwG9A1q1 0G0UHugXwk7jQiknHgCVepEOHrDX3tIMliIHk5Q/g0NCyuxaVwwsFKC95DQFGZP5v28ANbaQDLaSvQ== Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/dfpwmdec: Check packet size more completely 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: B7Nv6A2KfAmk Fixes: out of array access Fixes: 45497/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DFPWM_fuzzer-5239786212818944.fuzz Fixes: 45510/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DFPWM_fuzzer-4947856883056640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dfpwmdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/dfpwmdec.c b/libavcodec/dfpwmdec.c index 27b60a4ea4..e11f393ee4 100644 --- a/libavcodec/dfpwmdec.c +++ b/libavcodec/dfpwmdec.c @@ -106,7 +106,10 @@ static int dfpwm_dec_frame(struct AVCodecContext *ctx, void *data, AVFrame *frame = data; int ret; - frame->nb_samples = packet->size * 8 / ctx->ch_layout.nb_channels; + if (packet->size * 8LL % ctx->ch_layout.nb_channels) + return AVERROR_PATCHWELCOME; + + frame->nb_samples = packet->size * 8LL / ctx->ch_layout.nb_channels; if (frame->nb_samples <= 0) { av_log(ctx, AV_LOG_ERROR, "invalid number of samples in packet\n"); return AVERROR_INVALIDDATA;