From patchwork Fri Nov 18 21:09: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: 39332 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp611965pzb; Fri, 18 Nov 2022 13:09:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf5QN4/EC827gAS6RTF2MDeeB9/w83tf4gpKmxdD585DcCT87SaRcWPn80oEZseHjkx9A69o X-Received: by 2002:aa7:c9d0:0:b0:458:ed79:ed5 with SMTP id i16-20020aa7c9d0000000b00458ed790ed5mr7699915edt.374.1668805792143; Fri, 18 Nov 2022 13:09:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668805792; cv=none; d=google.com; s=arc-20160816; b=uASaNcGxgdy3zWKKtPIiDIQqAOjuB/6c1uSBsdB4dlZQyQO4h8gfMNvm15u0AlglVt D/IZpoPEjjS4nNeYz1PmPRVgj3QZ1XY0lK/65uvfNvf/2HE7PMz2IvUXhlX1WygfisW4 UWbnVyXCA+38a+MkdYUdOz7mHB9QE/dIPxSsKk/4P0prulbHzENgDNn1z0Kw82t2eDca TwOyYg3I4xsT1+/WfPsotff5Dtb4wjsEgLtfWpvBlSBl4qucAMkxbKIvvQ2PPI5yREEQ io3OnluWDqoUdQh8uuo3mXHxqQDX2lCSrOWM/mbiNYUCpDSP6LCtHgZ9eOJcO16qHlHx 8/MA== 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=xiKe/59EcT7gr4TpAAFeW5uEwS7w+sSJZnMIOtd/1UQ=; b=q8tcfRnWa2SiY/cNnXLwM8mRkLBKCAh+zy13mHzlJMRGQxuK6kxbjAACyZh5ZFA5Qo qwd5n39/JejxiH6fV38hvNVGpKhq4m/T7O6/zhx02mswJU7OVuKI5hOV5F3F6/vQ+1aZ 1cKflTLXk7ORpXLxHnicUk6TnVLTI0ME9y75oD07ZVHXNAgif9nMfla+VFWbUWNay8f4 XOukSaseB9Pc8jjp7dNXKYWo1e+kd3h+rb0Sc/kLibzCLAsRb8I2sF+cWUwtRHweMZ1P 3PAiz03we0kJopocX/7Ey690Is+W9oOXhU822SI4728x2e/748hGiGcPkwtGUreo+Pag dRlQ== 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 ta6-20020a1709078c0600b007ae0e8f59a6si3432040ejc.821.2022.11.18.13.09.51; Fri, 18 Nov 2022 13:09:52 -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 01B0568BAE8; Fri, 18 Nov 2022 23:09:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C146A68AA68 for ; Fri, 18 Nov 2022 23:09:23 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id DA942100005 for ; Fri, 18 Nov 2022 21:09:22 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 18 Nov 2022 22:09:17 +0100 Message-Id: <20221118210918.3169-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221118210918.3169-1-michael@niedermayer.cc> References: <20221118210918.3169-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/mobiclip: Check input size before (re)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: iQOrTRn2nrQc Fixes: Timeout Fixes: 52566/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOBICLIP_fuzzer-4913160050311168 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mobiclip.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index aca462428c..c3b2383dbc 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -1216,6 +1216,9 @@ static int mobiclip_decode(AVCodecContext *avctx, AVFrame *rframe, AVFrame *frame = s->pic[s->current_pic]; int ret; + if (avctx->height/16 * (avctx->width/16) * 2 > 8LL*FFALIGN(pkt->size, 2)) + return AVERROR_INVALIDDATA; + av_fast_padded_malloc(&s->bitstream, &s->bitstream_size, pkt->size);