From patchwork Wed Aug 2 00:01:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 43070 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp309252pzb; Tue, 1 Aug 2023 17:02:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlEIdTo7D2mrhvpT8idUZVGfqYSiYb5fIbhdJpwCOdf05EHQ68aqURt/5o7MTRbBUzTS+dgg X-Received: by 2002:a17:906:53ce:b0:989:34a0:45b0 with SMTP id p14-20020a17090653ce00b0098934a045b0mr3991577ejo.49.1690934532402; Tue, 01 Aug 2023 17:02:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690934532; cv=none; d=google.com; s=arc-20160816; b=vovFD8U1fkpsKufc+J5dOVQp1cEaEnqyJLmZ04ZbJ/wcynzLrxarq/DLHRPg36zWbg ryE0AX3u3M/uiOOR6fH9YO89E0hx6F7AE/fJtT4X1GU1C4NSVHp1oRQrnPF7E74Y9yy5 TSBI84CVUNObk4yWK4UojtK0S6UkkZkuhxvMEGHxkvczxmV5h0xlYqPEz2pwsrBjB5Bw +adWVPLuFJmoFIZNJ+sqz2lHZH4x8qBYIRCME0ZGFyLnjK0eVnXOHROgoRacqfVWYAJ/ ofkkfKzMsLohuXXn1/WC8k8r8CmEdkLVeEY1DAG8K7AbFaa+0aEkNplhGZWkFfewVpwE TKQg== 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=e5+g1hV+Bz8UlZNf5tBAycSOSCBWagP2v18bnp6tK98=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=BxvxhtZjLwez/wZVHaDFTDWOlZeRqq6QoMVTxqmF+cesURTQzalX7fV5i3oukZCYIo U7wrVXfZE3lXdL1cFFy3vfoTP93N3uFOq5oxnV/I/XPfJFMo9Q/yPmeydJXYLMguyJ6G MMurg/GynjXEnAqMyWH6k58MusOHOBoun87+NJGqnt0hOuNmVVZhfFP6tmnx4ywBP6SK YklrlX16y5cUCSfIsM79iymyxfmg9ik74mOXqJjPxvQoMqupznkpJQqX2RbyWR5+MJYW qoxh0XaCbsVemugNBHJJ87DUKs8ujUQ61XBLjnem9z08G7bpA4qDDA6rto7AUPVYbcT1 y/Hg== 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 n19-20020a170906165300b00992e51fe33bsi5338893ejd.118.2023.08.01.17.02.11; Tue, 01 Aug 2023 17:02:12 -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 B7BBB68C58E; Wed, 2 Aug 2023 03:01:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D1E968C52B for ; Wed, 2 Aug 2023 03:01:39 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 754CD20003 for ; Wed, 2 Aug 2023 00:01:38 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 2 Aug 2023 02:01:35 +0200 Message-Id: <20230802000135.26482-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230802000135.26482-1-michael@niedermayer.cc> References: <20230802000135.26482-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/jpeg2000htdec: Check m 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: +iXDqNZL0WQj This also fixes assertion failures Fixes: shift exponent 95 is too large for 64-bit type 'unsigned long long' Fixes: 58299/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5828618092937216 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000htdec.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000htdec.c b/libavcodec/jpeg2000htdec.c index 3985783f3a..ae2ee6d6ee 100644 --- a/libavcodec/jpeg2000htdec.c +++ b/libavcodec/jpeg2000htdec.c @@ -689,6 +689,10 @@ static int jpeg2000_decode_ht_cleanup_segment(const Jpeg2000DecoderContext *s, for (int i = 0; i < 4; i++) { m[J2K_Q1][i] = sigma_n[4 * q1 + i] * U[J2K_Q1] - ((emb_pat_k[J2K_Q1] >> i) & 1); m[J2K_Q2][i] = sigma_n[4 * q2 + i] * U[J2K_Q2] - ((emb_pat_k[J2K_Q2] >> i) & 1); + if (m[J2K_Q1][i] > 63 || m[J2K_Q2][i] > 63) { + ret = AVERROR_INVALIDDATA; + goto free; + } } recover_mag_sgn(mag_sgn_stream, J2K_Q1, q1, m_n, known_1, emb_pat_1, v, m, @@ -723,8 +727,13 @@ static int jpeg2000_decode_ht_cleanup_segment(const Jpeg2000DecoderContext *s, U[J2K_Q1] = kappa[J2K_Q1] + u[J2K_Q1]; - for (int i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { m[J2K_Q1][i] = sigma_n[4 * q1 + i] * U[J2K_Q1] - ((emb_pat_k[J2K_Q1] >> i) & 1); + if (m[J2K_Q1][i] > 63) { + ret = AVERROR_INVALIDDATA; + goto free; + } + } recover_mag_sgn(mag_sgn_stream, J2K_Q1, q1, m_n, known_1, emb_pat_1, v, m, E, mu_n, Dcup, Pcup, pLSB); @@ -855,6 +864,10 @@ static int jpeg2000_decode_ht_cleanup_segment(const Jpeg2000DecoderContext *s, for (int i = 0; i < 4; i++) { m[J2K_Q1][i] = sigma_n[4 * q1 + i] * U[J2K_Q1] - ((emb_pat_k[J2K_Q1] >> i) & 1); m[J2K_Q2][i] = sigma_n[4 * q2 + i] * U[J2K_Q2] - ((emb_pat_k[J2K_Q2] >> i) & 1); + if (m[J2K_Q1][i] > 63 || m[J2K_Q2][i] > 63) { + ret = AVERROR_INVALIDDATA; + goto free; + } } recover_mag_sgn(mag_sgn_stream, J2K_Q1, q1, m_n, known_1, emb_pat_1, v, m, E, mu_n, Dcup, Pcup, pLSB); @@ -920,8 +933,13 @@ static int jpeg2000_decode_ht_cleanup_segment(const Jpeg2000DecoderContext *s, U[J2K_Q1] = kappa[J2K_Q1] + u[J2K_Q1]; - for (int i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { m[J2K_Q1][i] = sigma_n[4 * q1 + i] * U[J2K_Q1] - ((emb_pat_k[J2K_Q1] >> i) & 1); + if (m[J2K_Q1][i] > 63) { + ret = AVERROR_INVALIDDATA; + goto free; + } + } recover_mag_sgn(mag_sgn_stream, J2K_Q1, q1, m_n, known_1, emb_pat_1, v, m, E, mu_n, Dcup, Pcup, pLSB);