From patchwork Sun Nov 27 22:34:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39518 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp7111779pzb; Sun, 27 Nov 2022 14:34:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf4sjrfATsW+0QytKoTscTWh4a0dW6XACWBnGz97XufvVEI+kb9lVKKiIp0RjV2+JY57yhbA X-Received: by 2002:a17:906:15ca:b0:7a5:7c1c:cc5c with SMTP id l10-20020a17090615ca00b007a57c1ccc5cmr40837153ejd.644.1669588494029; Sun, 27 Nov 2022 14:34:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669588494; cv=none; d=google.com; s=arc-20160816; b=kGUZRhgGpXFUo7/Ti5LIpQUwOIX7OIKY8QlcnnD+p3LdnAD9PPExlBRTMfFjVfosOb falOup+dTk2liEsL2B0FpcTgOzVF3cZ1BcfyZ993tR9/Bp1Q0641LukoH3BEHX1Idz+j WRNfSSlzJ97C3KpcchokHohiZbAKwGRCTM1TWUPrJV03q6i8Me62EDAkWyi38We+UxPH feJPyd3PphSBxlll/LhxJCMNLcUOjBHrEdmo49V5gSM/gKLg14yN1LqgjTcCTHqsNuA6 LxeIS+5JbXfnm7Sr/tWrr+SToa1lZhVcEqkbg+iNKfwQQPkE7FwEqYSGTBD2r8T9o7sY pApQ== 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=EYjbtFB4QbGDoiaj8eLFw+RWr+9QVvPhvsjRL74bQXI=; b=Pj+NLpAlmS3djSgv0NueRY1ZE9hyuXFg/rUV6a1/BjBDx5Gl2GOFmIuT44z6V/dp27 iiaUYDxfWbORJl0nglTAD61Mm1tnEz2bpPoQscc4vM8tZGncFxQ5/sThq+LU81BBMmkp 8BhPtLgGooUKPiRjiN8M0QCapDsU2CwQanq6QWJEQPEc2vkGmWF/la/9h/oyL0+1u79+ tEYAcE3qApftH5O9Mz11593W1N6+wktuxsmRvhPCMQKzB0jIV04BiflN1g1UGCHzC4dt 0Fb7LYItlQQqN0+Wjf+SA9Co1kfP02zTiAaegrz6ZsnrbZn0crrAcSpNN+9ZmrqhmU7E 3KBA== 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 xf9-20020a17090731c900b007b28c65347esi8785626ejb.695.2022.11.27.14.34.53; Sun, 27 Nov 2022 14:34:54 -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 2C50B68BBA4; Mon, 28 Nov 2022 00:34:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD64668AEE0 for ; Mon, 28 Nov 2022 00:34:37 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 02203240004 for ; Sun, 27 Nov 2022 22:34:36 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 27 Nov 2022 23:34:34 +0100 Message-Id: <20221127223435.8362-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221127223435.8362-1-michael@niedermayer.cc> References: <20221127223435.8362-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/vqcdec: Check width & 15 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: yF+Vy4QbzPjX Various parts of the code assume that width can be divided by various powers of 2 without rounding Fixes: out of array access Fixes: 53623/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VQC_fuzzer-6209269924233216 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vqcdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/vqcdec.c b/libavcodec/vqcdec.c index 18cd99462e..c3bce87974 100644 --- a/libavcodec/vqcdec.c +++ b/libavcodec/vqcdec.c @@ -71,6 +71,9 @@ static av_cold int vqc_decode_init(AVCodecContext * avctx) static AVOnce init_static_once = AV_ONCE_INIT; VqcContext *s = avctx->priv_data; + if (avctx->width & 15) + return AVERROR_PATCHWELCOME; + s->vectors = av_malloc((avctx->width * avctx->height * 3) / 2); if (!s->vectors) return AVERROR(ENOMEM);