From patchwork Sat May 29 09:35:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27978 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1254704iof; Sat, 29 May 2021 02:36:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+m5lLlundBE3IL6wnzeqPZGMEZhPHrz7CM2833gcMl9SaNQ3zHJXVkZ4yuxx/yv0QWAg0 X-Received: by 2002:a17:906:1997:: with SMTP id g23mr13350459ejd.168.1622281002990; Sat, 29 May 2021 02:36:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622281002; cv=none; d=google.com; s=arc-20160816; b=bYhoSXLPJiDG/oBAilNTIL/QC8afV/n91U2YlBnrUL4tv4emWuujKet32neaot0T+u 7MMPmz67a5JOmF8LftnZsILgtj4CF45SxV7nO27r6fkuzgWkEZXSvaYB5bqLXQJtfgKg Xc8OwhIJJVtIjY/KEhjBAybJxUcMrbX2fvYhcEc7/yKTYWRdfDMbsjUrGQvYwf0oy7X9 suLGyzscj9lKjrCZB62/NZlZp4T+o1lRTixdS3ePLYlHszZg4Ls5juetlVUR3shssgfu GWfK1B4acjBwAdZsG+ji12vi4E1f2dYHPJrumIHu5XmSkgDkuh+4ulXcnQA1jYZ/aB9p FO4w== 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=rbrzHSCR3jVutH3Zj8xUPbv7bsErpiI3The0Q+9WBDg=; b=HAeiuVfnQ2khL7Gj6ETS7sEkaC4kkGaNExxAXstHSFqXlajgbclJeodLFxAWl7M2Y3 ODkYkZn5+7ep1Edo6ohYximJnOU47VjaSfID+GbgvoAYngKkAI3w8CaJ3mr0Q/8wS1PZ 6BRcnO9QFeAwGpaWgcTKIftZosTLjMlvdldFiv50mEdQk3Y+H9/YQR7l5F8RpU2wduyx sxj9apHgLmPVC3loHoPrPoNeQNVRrJqV6bW1ZRaVwTMCVw2pWippDobLkm0gfGigJX+F 3vs4r1ixpqNsViaadghlza9ivrSEFx+/WNvucdruV0odnQCwHeYSJbcYfC1YY9ZK4/C7 EhFA== 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 jg40si6986818ejc.465.2021.05.29.02.36.42; Sat, 29 May 2021 02:36:42 -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 742FE688178; Sat, 29 May 2021 12:36:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37EC668803D for ; Sat, 29 May 2021 12:36:31 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lmvOQ-005rF2-0C for ffmpeg-devel@ffmpeg.org; Sat, 29 May 2021 11:36:30 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id mvNSlDP4LljeHmvNSlLQEU; Sat, 29 May 2021 11:35:30 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=QxMUGsJoJTC3VKdc9MUA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 29 May 2021 11:35:29 +0200 Message-Id: <20210529093530.15419-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210529093530.15419-1-michael@niedermayer.cc> References: <20210529093530.15419-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfA14aINybRCcwZg1hx77mKCXIuwxzkNEHo85xoD8OSWujjOA8ORDfadMVohLgRihAOd8L7UxAPF7j8J4DpKuksxFXSKm8U593RKB7cwrRqUWo0wfgH2U dc2bgMtK7XSq0xtGdUORo+al1RDsFCK/AJBQ1E+bAUOrd81SCYBg0e8p Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/vf_vmafmotion: Check dimensions 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: asjhrtaRzxk2 Fixes: out of array access Fixes: Ticket8241 Fixes: Ticket8246 Fixes: CVE-2020-22019 Fixes: CVE-2020-22033 Signed-off-by: Michael Niedermayer --- libavfilter/vf_vmafmotion.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c index 2db4783d8d..454ebb8afa 100644 --- a/libavfilter/vf_vmafmotion.c +++ b/libavfilter/vf_vmafmotion.c @@ -238,6 +238,9 @@ int ff_vmafmotion_init(VMAFMotionData *s, int i; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); + if (w < 3 || h < 3) + return AVERROR(EINVAL); + s->width = w; s->height = h; s->stride = FFALIGN(w * sizeof(uint16_t), 32);