From patchwork Sun Jun 16 23:08:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49964 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1606805vqg; Sun, 16 Jun 2024 16:09:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVXLfxaxpqwQPGQgKKkeFOdU5zpev1LwgfoNihgwZIzJdCdwMpS+OE7akF3ay/t8cxxDbeq9ol7cmlEUjLhjnObfk/dz3tGKDjkUQ== X-Google-Smtp-Source: AGHT+IHtc+Sd8gxW4sct7dc1NieXiBMv06cxQesSz9R2xEF6OHezJhW98pOpZUcq7isIpYpUPEB0 X-Received: by 2002:a50:9f64:0:b0:57c:6f67:b17c with SMTP id 4fb4d7f45d1cf-57cbd6742bfmr4821817a12.7.1718579391393; Sun, 16 Jun 2024 16:09:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718579391; cv=none; d=google.com; s=arc-20160816; b=mXF7X2f4hndGrwzoimgF72LmE2CMw+APtkOI3NAvMGGzhuXkkoz3ogXIjE6iXazwtx pZhgopggG4iVVrJIOP54jcQ9EFSAEJto3/ko1ZzNmwRseewxTRdwB14KOgBjVgtgtCAB HS8GfUoWvPIkFBQb5UqI7mXgQTaHKnWFoydXrzpuvYZ1LNFxehvBgMdeLeQ/eXWEvrwd Gx9EotOtAZ21vUwP/IvC9aP4Vihu895YcdrrW8hZA9hxwtgbXjGoqN32J+Ap8PvkVXVE m4jNsLubsvW4tJDf6Zv4Z4qAY8IpF35+6H/PMOo3ncul7MnxjAV4xU19FP8slOHSCTAl kuiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=fAjY1WEcZ9GzFJH4ANYdnvVpwhsa616Vq7MFtzaMQtk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Z7LR7jBvfTm/p3rlOELg5P5CvtG2zo0nso3HmlK8JLYGLGq8cji0WwAAxvP7U6eyuQ ALZcnog4u2hvjHYZ9AN37HyuloOYFvu8+svA+RWu7uR8VdrqC+0md06uKFhHav0/aHvQ T8VouHMq+2WoE63B1pL1VuC61wWj7xL8dB5vv32RYO9BZ24wa/ixNq2a7e1Yozwj7Kkr C3u7LAjg07gTz8cqqvzrgkEApcC+KNnPjz/ZgAT3ntwSnkGnssM59XUpG5e0tcvoXMEs KgM6lhIj1mI8DP4KP9epvykvb9LhHHIiCCqNH+HJaesNpzayJVBpY+yYpW3wSuJCLhgz USZw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="SE6l/q5M"; 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 4fb4d7f45d1cf-57cb745d981si3927474a12.499.2024.06.16.16.09.51; Sun, 16 Jun 2024 16:09:51 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="SE6l/q5M"; 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 9060E68D771; Mon, 17 Jun 2024 02:08:53 +0300 (EEST) 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 C3AEB68D74F for ; Mon, 17 Jun 2024 02:08:40 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E8D6AC0002 for ; Sun, 16 Jun 2024 23:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718579320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GPkpTCM3j8zHBxwOW38nkXQ5XYrMAlK/KaUWBWBNAeo=; b=SE6l/q5MWRnX0Gdz0avpml9fio3E1jQT/24VesomrzF4y5wxZPMJSMz2emsu/uN/G4Qso4 4x5S5kMNpyYEKUs7dGjCkpg/ojWLOXtjeZh7vMth0lkNuqNfm/mVG8G1Bt25+lMdEoQpTR c/fvyC2lg1rW2jb8ipgblXu6fM1xN+PYTGvP+pgn/EwLudS9JZ2zma8Q7CYgF42xOhR3/W /TOGp9kF8LuPwh7NJEmPNVtYuqZX1wROkhIldZHJetfz7WWv78/b42k/UVKskCcLo+Y6Y4 2RA+YUhrOowUAjY3v0n7ZIqvZB0C2m/XyYD4EsEU1CG7frvokCESC0QAlTqdLg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Jun 2024 01:08:30 +0200 Message-ID: <20240616230831.912377-8-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240616230831.912377-1-michael@niedermayer.cc> References: <20240616230831.912377-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 8/9] avcodec/smcenc: width < 4 is unsupported 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eqNwu01W8rFg Fixes: out of array read Fixes: 68939/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SMC_fuzzer-587804104884224 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/smcenc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/smcenc.c b/libavcodec/smcenc.c index 789aef4f770..d70cce900ec 100644 --- a/libavcodec/smcenc.c +++ b/libavcodec/smcenc.c @@ -537,6 +537,9 @@ static int smc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, uint8_t *pal; int ret; + if (avctx->width < 4) + return AVERROR_PATCHWELCOME; + ret = ff_alloc_packet(avctx, pkt, 8LL * avctx->height * avctx->width); if (ret < 0) return ret;