From patchwork Thu Jun 9 21:37:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36101 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp601954pzj; Thu, 9 Jun 2022 14:38:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/BRmgZQrvhflTUZ4dRlLKG2hu0fqXw9jIsX6461RKmU9WlDbkTyzv/dEtG9KxMVQOPjN0 X-Received: by 2002:a17:906:acb:b0:709:d274:611b with SMTP id z11-20020a1709060acb00b00709d274611bmr38002970ejf.147.1654810737148; Thu, 09 Jun 2022 14:38:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654810737; cv=none; d=google.com; s=arc-20160816; b=awfo40ZiQeKmpyPMDWCwye8Gim3gd0fS+LeEbkV3ONtcHvHf2N7Oi4g/JK9Z0Mg7KL 2PFMP3LcTeqaPNflGT878J+rfGGNblJBXOsz9G+y17UgmH7dnJHIXfhFKlMdYXmsXl2c CF/m+jEMwnLwgkpaFUyElYNkxDRl7O8VqIUQtGBzRogN8ovdvfmcx4cdxEjjS0g11JBY 0LY1su9wkLBQfH4U4BxJqbXTcqUBhYJsAjFBNgm+97XNiOs/7AC1rvAjnmXq9SWyhWlZ OEzQxBaCNny/hIimuR1yz+vcnXMpSsI+fwUTQDpLga7fOe8e/NINsB+F5PmmAStIIrmg +nVg== 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=4qgaVlD522HZAUTEIFJHb20hHnRJl+TTJTlwf8S1/CU=; b=JX0gOC4KKR4rgcLJ9i0qjGpzL9PTTiOsYYfOqeZA3UOf1sXk5vwyHZCO0yiNPU3Aeb sWdzKpq8HIdZD3S4gKGPz4zAIUHCUXZCqvJCciidLhsQzEYmCb/M/okfxpFONC7gh7RO mr/0e2zn6nLhsmzaBkpqZK6zh4EwBWJTIbawQmKUq81K2uhH6Wj2x17YSfLQ39ztEJ3i oCmC1HKOjVx/id0dkRzxGL8D3UvrucA9qsu0eAmzXKUe6UAWX6KpzJ8ryZZ9wxtOQwRT iwpExyYs0MWfzl1o9otnQVN81k9TvdDG/Cygfhh9+tetMGMe/fli8Ffm+mSvAtPPQ57F U35g== 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 ho17-20020a1709070e9100b00711c6a5c5e6si17819954ejc.545.2022.06.09.14.38.56; Thu, 09 Jun 2022 14:38:57 -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 0B6D168B7ED; Fri, 10 Jun 2022 00:38:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1763868B7E0 for ; Fri, 10 Jun 2022 00:38:49 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nzPrW-0008Ci-27 for ffmpeg-devel@ffmpeg.org; Thu, 09 Jun 2022 23:38:42 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id zPoxnJuf88s8UzPrWnFksq; Thu, 09 Jun 2022 23:38:42 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id zPqYndrMt8eSWzPqYnIFG1; Thu, 09 Jun 2022 23:37:42 +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=62a26826 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=Ex6i127nCZne-JE3lSgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 9 Jun 2022 23:37:40 +0200 Message-Id: <20220609213741.18029-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220609213741.18029-1-michael@niedermayer.cc> References: <20220609213741.18029-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfBE7XS1lrS58kwIRVqjNH2LHTrESVEflAiTCc703pmX7oskCgmb8CIreCufO2BjwKGOAJbSqrqS5tbpaUOGgQ6OR2KcM3GsbN7b6AWcYsqrziWI5uOG2 iKVL0DnFLKrWOzF2otSCt+liDCg1tcAcOuNSGTdUA0gHcjYBAsv0Pc0tSs0uo9AHqtJOb43EDOX2Ug== Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/hevcdsp_template: stay within tables in sao_band_filter() 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: r4v1Gf5clxm7 Fixes: out of array read Fixes: 47875/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5719393113341952 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevcdsp_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c index 56cd9e605d..61425975cd 100644 --- a/libavcodec/hevcdsp_template.c +++ b/libavcodec/hevcdsp_template.c @@ -313,7 +313,7 @@ static void FUNC(sao_band_filter)(uint8_t *_dst, uint8_t *_src, offset_table[(k + sao_left_class) & 31] = sao_offset_val[k + 1]; for (y = 0; y < height; y++) { for (x = 0; x < width; x++) - dst[x] = av_clip_pixel(src[x] + offset_table[src[x] >> shift]); + dst[x] = av_clip_pixel(src[x] + offset_table[(src[x] >> shift) & 31]); dst += stride_dst; src += stride_src; }