From patchwork Mon Jan 16 10:14:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp913066pzb; Mon, 16 Jan 2023 02:14:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXuvek4pfE3l/QNehxsWk5t+J3Z8jnCure1mMb+8J6AyXX2PAxzNZuLZep8UZ+0DpoRlLDwO X-Received: by 2002:a17:907:2587:b0:7c0:ac4b:8b9 with SMTP id ad7-20020a170907258700b007c0ac4b08b9mr64662115ejc.14.1673864089703; Mon, 16 Jan 2023 02:14:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673864089; cv=none; d=google.com; s=arc-20160816; b=G1la4B2GRlnNPq43/0ha9HEakJH6Jn3Dz58wNJ3GiWpzJsKJjOxH0yJ7i2wwY6KPnT PC+Fv/nFoc9q5XHgjKeiTGccFxq/CpIzFg3TTQ9D7ro6p2VZIi1/m+hMEQs4ftQqLz/6 OMGw7zAAXE1rpx+d5mGv0OQJdHDmfhAvv4Xmqnm71y2anMwHsC5TOnSXeSwlPco1+0vW ijWu1zGrIYHSc/ZP/8J6HEKnWUDRwlBXiIhI76cC2YhFFUAobffHRmpA3KoYiZ1RsknF JOMy+kYxTXoEmvrLxdbwlMg1PKekqYxeveF/dzzT9uc2Dvm/rxvbxKD6N+DEkHK9G4eQ wm6g== 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=0j0mIJjSpJxeKQ8AttGyJyiuBaesSv9OKtaPmnz4ddc=; b=UBJGHAYJuL5NmfeX9MVebry4NKlQePOupD9Y38eCSwCP8vZvyR/nUB2CdDWJMlRgkM XZ6ZWNRgihIusQxQ0shiuCuCZjxDqGmYUSO6kgDGlQ7xhz6N0y8VDx3b6faT0wcHSCu2 Nh7j+f7Si+KuDk9foM7KaX7B6fVVsUg3owNVmDccfLXTLF/TiEI7ONnDMRQQbLKS/6Ui fgvoVdtYzbMWFnSeaCWoMLXlVfl0+PcYpec/JWqWkDQXHYrT0WoZ+onfEkp4fmj7E5gg y4da7U1MwApR+C00/1dZF2a6aEZBxwUDssxQIMbC/D3VB/N5nGRChn/Hiq7dFqqmMhgG TEHA== 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 bd22-20020a056402207600b0046fbd084ea6si4319708edb.142.2023.01.16.02.14.45; Mon, 16 Jan 2023 02:14:49 -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 7B55068BD6C; Mon, 16 Jan 2023 12:14:42 +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 F3F7C68BBF3 for ; Mon, 16 Jan 2023 12:14:35 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id BD17410000A for ; Mon, 16 Jan 2023 10:14:34 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 16 Jan 2023 11:14:33 +0100 Message-Id: <20230116101433.10989-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/scpr3: Check bx 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: 6JF4uw4tLTn2 Fixes: Out of array access Fixes: 55102/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-4877396618903552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/scpr3.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/scpr3.c b/libavcodec/scpr3.c index d9ea6af1c1..5271717ac7 100644 --- a/libavcodec/scpr3.c +++ b/libavcodec/scpr3.c @@ -1167,6 +1167,9 @@ static int decompress_p3(AVCodecContext *avctx, int run, bx = x * 16 + sx1, by = y * 16 + sy1; uint32_t clr, ptype = 0, r, g, b; + if (bx >= avctx->width) + return AVERROR_INVALIDDATA; + for (; by < y * 16 + sy2 && by < avctx->height;) { ret = decode_value3(s, 5, &s->op_model3[ptype].cntsum, s->op_model3[ptype].freqs[0],