From patchwork Wed Jan 11 20:42:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39973 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5037780pzb; Wed, 11 Jan 2023 12:42:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXvEUDGYmbzDI2F3KDO1CMFYvVzwod/FEDJbSmp6AGfJrA8+N2nGb4Hnpj00bjUv/riJh3cP X-Received: by 2002:a05:6402:c8d:b0:499:bec8:3a78 with SMTP id cm13-20020a0564020c8d00b00499bec83a78mr8066724edb.41.1673469755743; Wed, 11 Jan 2023 12:42:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673469755; cv=none; d=google.com; s=arc-20160816; b=BYGWwujDMzRX/E39tIRxfHZ/qpATnLTMvYDuNJZattkSChj1QTKpxOpS2m5POVvLOg mp/689U5ELmWGAEdOFAxL7qzpqSawLNAx+qT/5xuS4OO3nt9+jFv7pB/kerm62e3z3xO 3ya+Earrx90kfnTAVIHtdy9oQU9MI3jnaFpDHLQ1MrI1yq9K9ZbZa/gKl8wamulVzoMD ldvzuuOd5Rk10MVnq05/lNR3YHXKv7BGD1GtwfYoaAc50nHk6Vz3weRrNGiyoTKnOCH6 CZKifqf9cuGDgWTYOsb9YKdHM0AiGTmQIkv190UeAU0rSieuUXWH83Fe57lzN8CGqdIC 55YQ== 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=ae3b7WdTyJqcDUm9Cm4m5NKWGoKlGKLGF5BzVkLcL/o=; b=OkzFAKj6Nk+9qlK3q40IUEkkJVw1aANbMRDIQiEhtKbMXpNhTgiZOo6y89kSIgQPKV 9uUt+YuXdpHA/6rntEhhRS2hqwSDObZThsGtMtAQ3iAYQFFjB2U13+w+hSbAp1KQ561p BBHLjKPYYI+OhkPq0z2f2H9QjWewQR4ZwJ3vGtKc365+iMQKSGYlo+bpy5m8Zp6//aum +mEEKmwwYMV4G6jJbAI5VTNOu4JZmi3op0nVhZ+rL3hWtrN1CWMWPmeTUQDNiv08uhJ2 MbfWIgWmqjazL7dFuveLYt/igwPeQuq0I1aFpqYAByEPzuCeP5mxRDLZUZALpqY5rxnG Pb6Q== 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 eb6-20020a0564020d0600b0046dbf1fd79csi19168121edb.612.2023.01.11.12.42.35; Wed, 11 Jan 2023 12:42:35 -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 51BF168A2BD; Wed, 11 Jan 2023 22:42:31 +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 BA78168A2BD for ; Wed, 11 Jan 2023 22:42:24 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id A1900100006 for ; Wed, 11 Jan 2023 20:42:23 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Jan 2023 21:42:16 +0100 Message-Id: <20230111204221.22550-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/utils: allocate a line more for VC1 and WMV3 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: 3Fs4yDe2iUvj Fixes: out of array read on 32bit Fixes: 54857/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC1_fuzzer-5840588224462848 The chroma MC code reads over the currently allocated frame. Alternative fixes would be allocating a few bytes more at the end instead of a whole line extra or to adjust the threshold where the edge emu code is activated Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2b63a498b9..1aa0a05a31 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -321,6 +321,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, *width = FFALIGN(*width, w_align); *height = FFALIGN(*height, h_align); if (s->codec_id == AV_CODEC_ID_H264 || s->lowres || + s->codec_id == AV_CODEC_ID_VC1 || s->codec_id == AV_CODEC_ID_WMV3 || s->codec_id == AV_CODEC_ID_VP5 || s->codec_id == AV_CODEC_ID_VP6 || s->codec_id == AV_CODEC_ID_VP6F || s->codec_id == AV_CODEC_ID_VP6A ) {