From patchwork Thu Oct 6 20:37:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38590 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp379186pzd; Thu, 6 Oct 2022 13:38:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM53OTolYh7cbdK1Ge9RlEfHQPe2PkmdqW4ZYRpSg7F468Pgd4Eyzmi1ZJD/J4mlZZztPtvB X-Received: by 2002:a17:907:94d6:b0:782:b10a:7e91 with SMTP id dn22-20020a17090794d600b00782b10a7e91mr1445114ejc.220.1665088693375; Thu, 06 Oct 2022 13:38:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665088693; cv=none; d=google.com; s=arc-20160816; b=enJG6RrWsL0aKgjrx8u5sPpDMXIUzYJbQtyUhDlaJrr9O31pgEJc5YMjfE0j9/qhSG rTTvbDH5l9SMre8Umj5RHcc0CaO5NAAo+cM5rzt0xmmJBZo/10qPjHHv8hNXuZoEoHBi FziYelg3OU+9P3ertMMoTkfObDvB1hjVnmPm/lR3biAFQRJ+jsBAHrmRubHDvo5+PxoN a6R7Dva9DQj/rVxC0xbiof58W8TXN+jLh2OjKMKeJj9ZhvwOmzyYBxYKjXsHb/P9LHe1 8h+aA6Ny8bDs2zVbFiAInI6L1iXmba842ZEgzNvD8jhPCgW//3fveIrUgE75cDhZyFUA UVwQ== 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=xVPVa4E1fq/ExTWWFQ/lRivQdLNztw9CAcOZkujNuXQ=; b=CQiGTXX7kXn5+s7+vLck8JVbTofPTFFT+kneUTZyNX2ma3zNvg6YW9lTjTGFEqsKj7 YA79qrsA+Gh/8pxJfY/tuuTAMNmCfj/D3gYUtXTe3p8n+NZ30V2pHFmCSHP4LG+hNDBJ 0t7KWXTK922P7kGsSBTS8fi2on550fCpqcr5NGsYwIpFsoF4kOJbbAnKjSft5D2sq3Kb ECCRtU+IuXtTyAK8sNtdpxP93rrwRfBca6NA97baC8c8WKOWeNabitxos7nEUaksAQdk aQCpJxJIOoJMZd1v9Ak7vPbI5mDlJtKmDJolhA3Iy++JInFGISfVIHBjTrzdxBlGh181 nhDA== 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 ht12-20020a170907608c00b0078cc4a8a956si390350ejc.881.2022.10.06.13.37.52; Thu, 06 Oct 2022 13:38:13 -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 B8F3168BB2E; Thu, 6 Oct 2022 23:37:19 +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 C528568BA96 for ; Thu, 6 Oct 2022 23:37:12 +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 1ogXcF-00ATUp-E3 for ffmpeg-devel@ffmpeg.org; Thu, 06 Oct 2022 22:37:11 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gXc7oWRDf8s8UgXcFogS44; Thu, 06 Oct 2022 22:37:11 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id gXcFoBvJJbZLDgXcFoh44T; Thu, 06 Oct 2022 22:37:11 +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=Ufwy9IeN c=1 sm=1 tr=0 ts=633f3c77 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=g15dB-8DGuoNj2nd:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=4MpObu1hbx339PFoaQ4A:9 a=GdR-FnjLSxcwICsfAHBS:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 6 Oct 2022 22:37:09 +0200 Message-Id: <20221006203709.8398-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221006203709.8398-1-michael@niedermayer.cc> References: <20221006203709.8398-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMmhGhszfE/rX300yfZvshp2ddiyimF9go0XzWKF+cCxcUKzK1gaT3AlLkyHBhXSbu8QInQCJHlaSp/OLOVPvyuhLTBCfyi2w7Vqtk0D46rpMiiQ2Vsm 7WJra8VmISvHnBYetCu4/pwNFVVCTxPk0RGH8XRaV2RgBh4tT7cLakRHIMUPBZn2CUItadGHNmTrwQ== Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/speedhq: Check buf_size to be big enough for DC 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: /c6QBqO4EaOD Fixes: Timeout Fixes: 51919/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEDHQ_fuzzer-6023716480090112 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/speedhq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 6dbba02776a..04ba4dd19c5 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -500,6 +500,8 @@ static int speedhq_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (buf_size < 4 || avctx->width < 8 || avctx->width % 8 != 0) return AVERROR_INVALIDDATA; + if (buf_size < avctx->width*avctx->height / 64 / 4) + return AVERROR_INVALIDDATA; quality = buf[0]; if (quality >= 100) {