From patchwork Fri Jul 22 06:55:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36889 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp239453pzb; Thu, 21 Jul 2022 23:57:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vB4Wtxp+WF+An+6a4pfwYnnSbSfGppXK4RfvtIvurxNuUtcDlJy25kzXhYJ1V0+QW8SI6i X-Received: by 2002:a17:907:2c5b:b0:72b:54bd:40f8 with SMTP id hf27-20020a1709072c5b00b0072b54bd40f8mr1947908ejc.137.1658473019897; Thu, 21 Jul 2022 23:56:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658473019; cv=none; d=google.com; s=arc-20160816; b=BmOOBC5LeJc7s7zX2ebLXG0GmgEmQ8HnpUCEeEdnVNyRGyvv9rf4ycUpgaarD8D001 rzdZZO1x3PZrp91x2af9y4dAENidwkrGDeeKR06oMdgSwbpT1CCe/de0bGLrXrDVWKTX fnkGWJO6vvTsh/x2iBKgRglBZDAVCJzqN/Yp2kg8H9oW27S5K2Tuhep8PyhIkG1Tvn7H iLux3oJNAQIz2Y732KR6WzXY8wrRwIQzNGZW3P+Lnb30mZA7nAXEkPpbCkp8XF32JvC6 CUpmWKKzeEVds7Ard2RJSzx/iofKA4HtSVDuy4KSJgJI8R9hjV+1v6fu1XTQpK6NFwXO B1+w== 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=TGEnqEqwoyzNugFwDo/m7ZuCXdhyjcAUmlURr9B7FLg=; b=jpBT3OXD5tAppxbipVXk7Lbn1JZ81kLexadQcQxYLP45fN4QZdMOe96J05kHTXRC6F k88Md5KwcBTbn7/nJpYkwY+H4qH35MiFZku8h0VjT8n8R94fsTX+pHDAhXtqUH+kgOeH O//AjynJKDr8/Tc5oUXaaQTwdVneGok2lssfr4ouYbYXYERsGB00tW6iSytgnMFO+L71 aZLpriEYXrxLTd7a7J5vkj0kVdpoDhbofxv6zwurAUdiM9zdPRP4bSJCFdTlSUfTXqzd WG0eiHjRo1YO8mDFzGuDiurH3cRjokqFg9iCQZFvFdAh1nrKf6QAHKolrpextUNUF3Mj WZwQ== 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 y16-20020a056402271000b0043bb8927676si5410467edd.634.2022.07.21.23.56.59; Thu, 21 Jul 2022 23:56:59 -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 A76B768B6F3; Fri, 22 Jul 2022 09:56:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EC6368B2B9 for ; Fri, 22 Jul 2022 09:56:51 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oEmah-001rRP-17 for ffmpeg-devel@ffmpeg.org; Fri, 22 Jul 2022 08:56:51 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id EmXlox3cr8s8UEmahoijgE; Fri, 22 Jul 2022 08:56:51 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id EmZjoCPma8eSWEmZjoEiXd; Fri, 22 Jul 2022 08:55:51 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62da49f7 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=LJq_E2uEij-K6uqRWLEA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 22 Jul 2022 08:55:50 +0200 Message-Id: <20220722065550.5431-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220722065550.5431-1-michael@niedermayer.cc> References: <20220722065550.5431-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAoo7DQgraxKpBZ0k3CxBYojM0tLsALT/grUAd1XaPOVlbNM504enBFOJC+V567A4aZPBci7SkEgxWLeGchh6UR0IcXZxz2wgc7AdGS1VmyI4dp8gsCJ igDQHTW/fFTdwRhceI3zgZWd1/z8mr1c9H2gMNjKgsEQU2IlEoe/kI1kOwwYbzwfHPHEBtrvt18UxQ== Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/hevc_filter: copy_CTB() only within width&height 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: rO66X3lDW82v Fixes: out of array access Fixes: 49271/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5424984922652672 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc_filter.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 7b53c66c3b..1ae561db9e 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -143,11 +143,22 @@ static void copy_CTB(uint8_t *dst, const uint8_t *src, int width, int height, if (((intptr_t)dst | (intptr_t)src | stride_dst | stride_src) & 15) { for (i = 0; i < height; i++) { - for (j = 0; j < width; j+=8) + for (j = 0; j < width - 7; j+=8) AV_COPY64U(dst+j, src+j); dst += stride_dst; src += stride_src; } + if (width&7) { + dst += ((width>>3)<<3) - stride_dst * height; + src += ((width>>3)<<3) - stride_src * height; + width &= 7; + for (i = 0; i < height; i++) { + for (j = 0; j < width; j++) + dst[j] = src[j]; + dst += stride_dst; + src += stride_src; + } + } } else { for (i = 0; i < height; i++) { for (j = 0; j < width; j+=16)