From patchwork Mon Jun 13 00:10:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36189 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp222676pzb; Sun, 12 Jun 2022 17:10:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy49Hv2q2WQQ7BcfzcgZSyeKLWkRvfiBOq7x7bZXmkX1deBRuvcJhsAR0Vj3VpV302AzyRH X-Received: by 2002:a05:6402:4410:b0:434:f35f:132e with SMTP id y16-20020a056402441000b00434f35f132emr2467333eda.215.1655079044480; Sun, 12 Jun 2022 17:10:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655079044; cv=none; d=google.com; s=arc-20160816; b=LfN65ts5Jx2e5lE6nyvp843GW4XVgmyuRY5KltLsCC1IDS2ML5TTSZwyuthqneHYJk rOx+5pf0/dj15h5WJlZXPQ8nFISVp9LYI3iCACgfXotxH5NNQTZMZHms1cetiPzjYjrH 1QgkSvV9ZNHYkQjDgsLk0VdZgaoMj1e2BrtoVG16VgJMeKA7hxNdi5oVfj2UGgwV9F6Z MuduonZstqYp2bjXGrHoDNmtwvIT2VoIyemWLibeUiRLnZOy4iBgs1n+02sU0zhZ0tsA dQxVOpTXkLH4ILDH0mctLa6Sjb1iWQr+280l5bLlFoLm5B88SJP4+9PVJUG32y2V0aFr TDYA== 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=iTQdEvQwcnp/5XgqEJPSxkFTXjBU8FY7vgun68+lOz4=; b=Ro8IlAtdL7RBx/MxhuGli2MFWYJss7B+TdmKibRew6N2SopwkWfL/pXyZlt2YiGdZX LdmjUUth97cNYGlV+1IUFW7kd1r3ViG85GseB5iDvBcrMtHnVPCtZoFjUUF671cBKEcc PFG9Cm3fPkwt+RXyUE94JAHB9bAO4ewkCSN9TDp6u53S1V/kkYxVAUun8nfDz68URpgS b2OlQntkwPPtEjDXJcoFww/JXEkI71XY1nO7JOA7OB0RJlTzZrqt8+hfB5KDGUos+qn4 jAelc5QsTjADAij5r0VP+24wkruCyyt0JMA1dHNhBSFRuTpUeVobgSAKbt2Ai9b9y/76 Vbjw== 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 c5-20020a17090603c500b00711cc52294dsi5341611eja.516.2022.06.12.17.10.44; Sun, 12 Jun 2022 17:10:44 -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 60B1568B52D; Mon, 13 Jun 2022 03:10:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-3.mx.upcmail.net (vie01a-dmta-at02-3.mx.upcmail.net [62.179.121.150]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3A9B68B3B1 for ; Mon, 13 Jun 2022 03:10:23 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o0Xew-0001Ut-Rl for ffmpeg-devel@ffmpeg.org; Mon, 13 Jun 2022 02:10:22 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 0XbwoecXL8s8U0XewoKLtF; Mon, 13 Jun 2022 02:10:22 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 0XewozJAI8eSW0XewoM9qO; Mon, 13 Jun 2022 02:10:22 +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=62a6806e a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=KBDumcJZRJ8iyMBVdhoA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 13 Jun 2022 02:10:21 +0200 Message-Id: <20220613001021.8065-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220613001021.8065-1-michael@niedermayer.cc> References: <20220613001021.8065-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAGOLauaHOVCWEZeXR0itTFeiGA9lfMu4HpSMGhUF6lR1vapXXNXrNTq7ke2VYuihNKkBCefIi1lZNh09K7VXctf6QM9LOauBV3FHuIvhDUrCxa/sHQ5 /32jr6OfjaXeP35Kv4f6A1kV6D5QDq86zDfolg0bv+nvSPVLGRxHeuK9bH4PcIS160C0IE9enOuw8w== Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/bink: disallow odd positioned scaled blocks 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: pqrztOlrzkXk Fixes: out of array access Fixes: 47911/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-6194020855971840 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index ce740ad275..ed4406d97d 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1088,7 +1088,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, for (bx = 0; bx < bw; bx++, dst += 8, prev += 8) { blk = get_value(c, BINK_SRC_BLOCK_TYPES); // 16x16 block type on odd line means part of the already decoded block, so skip it - if ((by & 1) && blk == SCALED_BLOCK) { + if (((by & 1) || (bx & 1)) && blk == SCALED_BLOCK) { bx++; dst += 8; prev += 8;