From patchwork Sun Sep 11 14:27:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37845 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1995755pzh; Sun, 11 Sep 2022 07:27:46 -0700 (PDT) X-Google-Smtp-Source: AA6agR5OLFvBnG4G1xenCw86jpz3zzeO77zkvNeDQ6m2IRjbAa1tPFMBarcHKiZU05Tr3ahadZ+z X-Received: by 2002:aa7:d453:0:b0:44e:4b1d:28a with SMTP id q19-20020aa7d453000000b0044e4b1d028amr18196267edr.112.1662906466766; Sun, 11 Sep 2022 07:27:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662906466; cv=none; d=google.com; s=arc-20160816; b=GXK0SFsfd3fg8TAr9JYC36+ypo1qppXmHfXi6GGVdr/JzLwHFXTqqpOQFvZgftlyOF 5vaPtqKmQFL2vfxvgYsRmV7m45UMePf9z5QMk5C9EgVQx5ywdbW57IXLR+ENt7Nkchr3 gW8kEM/Fe++7TxLs67tqf7ufyOy7Z5OrC32PYcABfUKBv1jaE31bm5cItWwFWSfibeJ9 2uKuxlusKBcmZjY+IjLj6v2IKTlWNDkHPZAVu1O92EZwfbHWT6di+ztXEtTxmrUqrtyF KLc7qAgkta9Zo6O0uo0HmvI6B0EzssOnvgJMbx9ICaeCdzpHG6Wseo2lys/5iUdcJubB bYtQ== 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=o/BobVLBSWHhS2w6/uBvOVNuj2J3UMhTzAONuv5daRs=; b=SdoHfOgO25rvaCnMcbbHIzzm3ImtWXm6Ey/BUNTsE2dtSSJiMH6WHbTFU/4ApkL7ki rScbYJdi5m3GzklQ0FFv2m6t3zH9XQzqdeHnyF9LgtoareU+ZCeJ0m1v9PQllUkhby+p O83bPylkIsZ2IZP+P4zQyfKNWNb1NB+0l5UVAFPlmcZIdO9rOhQWIpqvPR5bcqznm1l0 mKtOViZ+9tOtW4QL58iEW3rG3pm4NuvO/jEysbEalHLG9O1pwdAkAaZEXTVKNa9GGna7 csq8sIQ9kLfGOFJP8Y0nP40eIOQOo+vnwcRq0utQnRqDqhXzDJIEcj1NYAHDatrUbqHH vYfQ== 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 g10-20020a1709065d0a00b00772fe67d540si6072221ejt.433.2022.09.11.07.27.46; Sun, 11 Sep 2022 07:27:46 -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 1281B68BB21; Sun, 11 Sep 2022 17:27:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B2BA68BAD8 for ; Sun, 11 Sep 2022 17:27:24 +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 1oXNvf-002kcR-2G for ffmpeg-devel@ffmpeg.org; Sun, 11 Sep 2022 16:27:23 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id XNvfoQDpQ8s8UXNvfoqede; Sun, 11 Sep 2022 16:27:23 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id XNveoJTJaOPqFXNveo7UmI; Sun, 11 Sep 2022 16:27:23 +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=OcX7sjfY c=1 sm=1 tr=0 ts=631df04b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=ypIXc4zdbvirIAFt7-oA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Sep 2022 16:27:20 +0200 Message-Id: <20220911142721.30812-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220911142721.30812-1-michael@niedermayer.cc> References: <20220911142721.30812-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfPFM66c2Liz1O6dTBDGgBgY6PbQTekWs6PkC3ESc2TyQmqdVQZrjXuEPksthGRBEPJU3YK4lRJVlhbDmE1UD9rlkuuBBR5HxfffzN+jRtw4pi9qDYNyB gdsGrBW+OKlpF3A2u5xc+1QNyECsZoSq99yacLuVlvbZfjSHq5oVmjckqlfFoJkDc6Qkb8Jpwl7SSw== Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/hdrdec: Update w in inner loop of decompress() 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: xZRVbxOjCOk1 Fixes: out of array access Fixes: 50936/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HDR_fuzzer-5423041009549312 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hdrdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hdrdec.c b/libavcodec/hdrdec.c index 9b262f2ef2c..7727826e2a5 100644 --- a/libavcodec/hdrdec.c +++ b/libavcodec/hdrdec.c @@ -70,8 +70,8 @@ static int decompress(uint8_t *scanline, int w, GetByteContext *gb, const uint8_ for (int i = run << rshift; i > 0 && w > 0 && scanline >= start + 4; i--) { memcpy(scanline, scanline - 4, 4); scanline += 4; + w -= 4; } - w -= run << rshift; rshift += 8; if (rshift > 16) break;